From 33e680c8ad7ebf2b47d9e6469c25e3d3514364d6 Mon Sep 17 00:00:00 2001 From: enriquecd Date: Mon, 3 Oct 2016 12:27:59 +0200 Subject: [PATCH] add qr icon, separate menu bar, favicon and optional graph logo 46,64,45,80,55 (cherry picked from commit 359f0aaac126e1f22ac682a1d48e7a667187d354) --- pandora_console/general/alert_enterprise.php | 22 ++++---- pandora_console/general/header.php | 4 +- pandora_console/general/login_page.php | 19 ++++++- .../godmode/setup/setup_visuals.php | 50 +++++++++++++++--- .../custom_logo_login/pandora_logo_head.png | Bin 3767 -> 3644 bytes pandora_console/include/functions_config.php | 5 ++ pandora_console/include/functions_graph.php | 9 ++-- pandora_console/include/styles/pandora.css | 5 +- 8 files changed, 85 insertions(+), 29 deletions(-) diff --git a/pandora_console/general/alert_enterprise.php b/pandora_console/general/alert_enterprise.php index 9ec5be9b2e..79edd50361 100644 --- a/pandora_console/general/alert_enterprise.php +++ b/pandora_console/general/alert_enterprise.php @@ -84,13 +84,13 @@ switch ($tipo) { echo '

' . - __('The Update Manager client is included on Pandora FMS. It helps system administrators update their Pandora FMS automatically, since the Update Manager retrieves new modules, new plugins and new features (even full migrations tools for future versions) automatically.') . + __('The Uppdate Manager client is included on Pandora FMS. It helps system administrators update their Pandora FMS automatically, since the Update Manager retrieves new modules, new plugins and new features (even full migrations tools for future versions) automatically.') . '

' . '

' . - __('OpenSource version updates are automated packages generated each week. This updates comes WITHOUT ANY warranty or support. If your system goes corrupt or a feature stop working properly, you will need to recover a backup by yourself.') . + __('OpenSource version updates are automated packages generated each week. These updates come WITHOUT ANY warranty or support. If your system is corrupted or a feature stops working properly, you will need to recover a backup by yourself.') . '

' . '

' . - __('Enterprise version comes with a different update system, with fully tested, proffessional supported packages, and our support team will be helping you in case of any problem happen. The Update Manager is another feature present in Enterprise version and missing in the OpenSource version. There are lots of advanced features ready for the enterprise on the Pandora FMS Enterprise Edition. For more information visit pandorafms.com') . + __('The Enterprise version comes with a different update system, with fully tested, professionally-supported packages, and our support team is there to help you in case of problems or queries. Update Manager is another feature present in the Enterprise version and not included in the OpenSource version. There are lots of advanced business-oriented features contained in Pandora FMS Enterprise Edition. For more information visit pandorafms.com') . '

' ; @@ -104,30 +104,30 @@ switch ($tipo) { __('Update Manager is one of the most advanced features of Pandora FMS Enterprise version, for more information visit http://pandorafms.com.') . '

' . '

' . - __('Update Manager sends anonymous information about Pandora FMS usage (number of agents and modules running). To disable it, remove remote server address from Update Manager plugin setup.') . + __('Update Manager sends anonymous information about Pandora FMS usage (number of agents and modules running). To disable it, please remove the remote server address from the Update Manager plugin setup.') . '

' ; } break; case "modulemodal": - echo __("La versión de la comunidad no permite definir su propia librería de módulos ni distribuirla a agentes remotos, solo le permite hacerlo de manera individual en cada agente usando herramientas externas. Tampoco puede distribuir plugins locales ni acceder a la librería de plugins Enterprise para monitorizar aplicaciones como VMWare, RHEV o Informix entre otras. Cambie a la versión Enterprise para administrar sus propios módulos de forma individual o mediante políticas. + echo __("The community version doesn't have the ability to define your own library of local modules, or distribute it to remote agents. You need to make those changes individually on each agent which is possible by using external tools and time and effort. Nor can it distribute local plugins, or have access to the library of enterprise plugins to monitor applications such as VMWare, RHEV or Informix between others. The Enterprise version will have all this, plus the ability to distribute and manage your own local modules on your systems, individually or through policies.



* Todos los logotipos pertenecen a marcas registradas"); break; case "massivemodal": - echo __("You want to manage your monitoring homogeneously? Do you have many systems and is difficult to manage in a comprehensive manner? Would you like to deploy monitoring, alerts and even local plugins with a single click? Pandora FMS Enterprise Policies are exactly what you need, you'll save time, effort and dislikes. More information (link to pandorafms.com)"); + echo __("Do you want to consolidate all your system monitoring? Do you have many systems, making it difficult to manage them in a comprehensive manner? Would you like to deploy monitoring, alerts and even local plugins with a single click? Pandora FMS Enterprise Policies are exactly what you need; you'll save time, effort and annoyances. More information pandorafms.com"); break; case "eventsmodal": - echo __("Pandora FMS Enterprise has event correlation. Through correlation you can generate alerts and / or new events based on logical rules on your realtime events. This allows you to automate the troubleshooting. If you know the value of working with events, the correlation will take you to a new level."); + echo __("Pandora FMS Enterprise also features event correlation. Through correlation you can generate realtime alerts and / or new events based on logical rules. This allows you to automate troubleshooting. If you know the value of working with events, event correlation will take you to a new level."); break; case "reportingmodal": - echo __("The reports of the Enterprise version are more powerful: it has wizards, you can schedule sending via email in PDF, and it has a template system to create reports quickly for each of your customers. It will even allow your customers generate their own reports from templates created by you. If reports are key to your business, Pandora FMS Enterprise version can be very useful for you."); + echo __("Report generating on the Enterprise version is also more powerful: it has wizards, you can schedule emails in PDF to be sent according to the schedule you decide, and it has a template system to create personalized reports quickly for each of your customers. It will even allow your customers to generate their own reports from templates created by you. If reports are key to your business, Pandora FMS Enterprise version is for you."); break; case "visualmodal": echo __("These options are only effective on the Enterprise version."); break; case "updatemodal": - echo __("WARNING: You are just one click of an automated update. This may result on a damaged system, including loss of data and operation. Check you have a recent backup. OpenSource updates are automated created packages, and there is no WARRANTY or SUPPORT. If you need professional support and warranty, please upgrade to Enterprise Version."); + echo __("WARNING: You are just one click away from an automated update. This may result in a damaged system, including loss of data and operativity. Check you have a recent backup. OpenSource updates are automatically created packages, and there is no WARRANTY or SUPPORT. If you need professional support and warranty, please upgrade to Enterprise Version."); break; case "agentsmodal": echo __("This system is heavily loaded. OpenSource version could get a lot more agents but fine tuning requires knowledge and time. Checkout the Enterprise Version for a professional supported system."); @@ -136,10 +136,10 @@ switch ($tipo) { echo __("This system has too many modules per agent. OpenSource version could manage thousands of modules, but is not recommended to have more than 40 modules per agent. This configuration has B/A modules per agent. Checkout the Enterprise Version for a professional supported system."); break; case "remotemodulesmodal": - echo __("Too much remote modules has been detected on this system. OpenSource version could manage thousands of modules, but performance is limited on high amount of SNMP or ICMP request. Checkout the Enterprise Version for a professional supported system with improved capacity on network monitoring, including distributed servers."); + echo __("Too much remote modules has been detected on this system. OpenSource version could manage thousands of modules, but performance is limited on high amount of SNMP or ICMP request. Checkout the Enterprise Version for a professional supported system with improved capacity on network monitoring, including distributed servers."); break; case "monitoreventsmodal": - echo __("Too much remote modules has been detected on this system. OpenSource version could manage thousands of modules, but performance is limited on high amount of SNMP or ICMP request. Checkout the Enterprise Version for a professional supported system with improved capacity on network monitoring, including distributed servers."); + echo __("This system has too much events in the database. Checkout database purge options. Checkout the Enterprise Version for a professional supported system."); break; case "alertagentmodal": echo __("You have defined a high number of alerts, this may cause you performance problems in the future. In the Enterprise version, you can use event correlation alerts to simplify the alerting system and have easier administration and increased performance."); diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index b3a6ad48ed..9a6f04b20e 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -125,7 +125,7 @@ config_check(); $servers_link_open = ''; $servers_link_close = ''; - $show_qr_code_header = 'display: none;'; + $show_qr_code_header = 'display: inline;'; if (isset($config['show_qr_code_header'])) if ($config['show_qr_code_header']) $show_qr_code_header = ''; @@ -134,7 +134,7 @@ config_check(); '
' . '' . html_print_image( - "images/qrcode_icon.jpg", + "images/qrcode_icon.png", true, array("alt" => __('QR Code of the page'), 'title' => __('QR Code of the page'))) . diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php index 11eaf4582e..686564513a 100755 --- a/pandora_console/general/login_page.php +++ b/pandora_console/general/login_page.php @@ -89,13 +89,28 @@ echo '
'; echo ''; if (defined ('METACONSOLE')) { - html_print_image ("images/custom_logo_login/".$config['custom_logo_login'], false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true); - } + if (!isset ($config["custom_logo"])){ + html_print_image ("images/custom_logo_login/login_logo.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true); + } + else{ + html_print_image ("images/custom_logo_login/".$config['custom_logo_login'], false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true); + } + } else if (defined ('PANDORA_ENTERPRISE')) { + if (!isset ($config["custom_logo"])){ + html_print_image ("images/custom_logo_login/login_logo.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true); + } + else{ html_print_image ("images/custom_logo_login/".$config['custom_logo_login'], false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true); + } } else { + if (!isset ($config["custom_logo"])){ + html_print_image ("images/custom_logo_login/login_logo.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true); + } + else{ html_print_image ("images/custom_logo_login/".$config['custom_logo_login'], false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true); + } echo "
Community edition"; } echo ''; diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php index 3d2c848f8f..58348fc641 100755 --- a/pandora_console/godmode/setup/setup_visuals.php +++ b/pandora_console/godmode/setup/setup_visuals.php @@ -183,17 +183,11 @@ $row++; $table_styles->data[$row][0] = __('Custom logo in login') . ui_print_help_icon("custom_logo_login", true); -if(enterprise_installed()){ -$table_styles->data[$row][1] = html_print_select( - list_files('enterprise/images/custom_logo_login', "png", 1, 0), 'custom_logo_login', - $config["custom_logo_login"], '', '', '',true,false,true,'',$open,'width:240px'); -} -else{ + $table_styles->data[$row][1] = html_print_select( list_files('images/custom_logo_login', "png", 1, 0), 'custom_logo_login', $config["custom_logo_login"], '', '', '',true,false,true,'',$open,'width:240px'); - -} + $table_styles->data[$row][1] .= " " . html_print_button(__("View"), 'custom_logo_login_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal'); $row++; @@ -880,6 +874,46 @@ $("#button-custom_logo_preview").click (function (e) { } }); +$("#button-custom_logo_login_preview").click (function (e) { + var icon_name = $("select#custom_logo_login option:selected").val(); + var icon_path = "/images/custom_logo_login/" + icon_name; + + if (icon_name == "") + return; + + $dialog = $("
"); + $image = $(""); + $image + .css('max-width', '500px') + .css('max-height', '500px'); + + try { + $dialog + .hide() + .html($image) + .dialog({ + title: "", + resizable: true, + draggable: true, + modal: true, + overlay: { + opacity: 0.5, + background: "black" + }, + minHeight: 1, + width: $image.width, + close: function () { + $dialog + .empty() + .remove(); + } + }).show(); + } + catch (err) { + // console.log(err); + } +}); + $("#button-login_background_preview").click (function (e) { var icon_name = $("select#login_background option:selected").val(); var icon_path = "/images/backgrounds/" + icon_name; diff --git a/pandora_console/images/custom_logo_login/pandora_logo_head.png b/pandora_console/images/custom_logo_login/pandora_logo_head.png index 2f5b60fb370cfe8434580d87f01afa37e3046544..5bce825279eb091125976f6f559222afb50e4407 100644 GIT binary patch delta 3607 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 diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index 73be42986e..a52e81d127 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -1027,8 +1027,13 @@ function config_process_config () { if (!isset ($config["custom_logo"])) { + if(enterprise_installed()){ + config_update_value ('custom_logo', 'pandora_logo_head.png'); + } + else{ config_update_value ('custom_logo', 'pandora_logo_head_3.png'); } + } if (!isset ($config["custom_logo_login"])) { config_update_value ('custom_logo_login', 'login_logo.png'); } diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index bd57cc32c1..c8f5a41eb0 100644 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -863,10 +863,11 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events, if ($only_image) { $flash_chart = false; } - - $water_mark = array('file' => - $config['homedir'] . "/images/logo_vertical_water.png", - 'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false)); + if($config["fixed_graph"] == false){ + $water_mark = array('file' => + $config['homedir'] . "/images/.png", + 'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false)); + } if ($config['type_module_charts'] === 'area') { if ($compare === 'separated') { diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index edda27d5b0..6df6262f49 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -240,10 +240,11 @@ div#page { } div#main { width: auto; - margin: 0px 2% 0px 0%; - float: right; + margin: 0px 0% 0px 0%; + float: left; position: relative; min-height: 850px; + margin-left:60px; } div#main_help { width: 100%;