From 554fc18435ed59310268b9d920d833dc7eba39f8 Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Fri, 24 May 2013 10:30:03 +0000 Subject: [PATCH] 2013-05-24 Sergio Martin * include/styles/pandora.css extensions/update_manager/settings.php extensions/update_manager/main.php godmode/agentes/module_manager.php: Fixed various visual issues like update manager icons or width of left tab in godmode sections * godmode/agentes/module_manager_editor_plugin.php: Fixed tips of plugins help fields * extensions/snmp_explorer.php: avoid interfaces without name in snmp explorer * operation/agentes/bulbs.php: Remove old file git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8207 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 17 +++++++++ pandora_console/extensions/snmp_explorer.php | 3 +- .../extensions/update_manager/main.php | 2 +- .../extensions/update_manager/settings.php | 2 +- .../godmode/agentes/module_manager.php | 14 ++++--- .../agentes/module_manager_editor_plugin.php | 1 + pandora_console/include/styles/pandora.css | 2 +- pandora_console/operation/agentes/bulbs.php | 38 ------------------- 8 files changed, 31 insertions(+), 48 deletions(-) delete mode 100644 pandora_console/operation/agentes/bulbs.php diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 796ad67b27..86886129d6 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,20 @@ +2013-05-24 Sergio Martin + + * include/styles/pandora.css + extensions/update_manager/settings.php + extensions/update_manager/main.php + godmode/agentes/module_manager.php: Fixed + various visual issues like update manager icons + or width of left tab in godmode sections + + * godmode/agentes/module_manager_editor_plugin.php: + Fixed tips of plugins help fields + + * extensions/snmp_explorer.php: avoid interfaces + without name in snmp explorer + + * operation/agentes/bulbs.php: Remove old file + 2013-05-24 Ramon Novoa * include/functions.php: Cleaned junk characters. diff --git a/pandora_console/extensions/snmp_explorer.php b/pandora_console/extensions/snmp_explorer.php index 9a7c6d66b2..cb84ca0081 100755 --- a/pandora_console/extensions/snmp_explorer.php +++ b/pandora_console/extensions/snmp_explorer.php @@ -71,7 +71,8 @@ function snmp_explorer() { $keydata = explode('::',$key); $keydata2 = explode('.',$keydata[1]); - if (!isset($keydata2[1])) { + // Avoid results without index and interfaces without name + if (!isset($keydata2[1]) || !isset($data[1])) { continue; } diff --git a/pandora_console/extensions/update_manager/main.php b/pandora_console/extensions/update_manager/main.php index 7e9457ccef..0c67548bad 100644 --- a/pandora_console/extensions/update_manager/main.php +++ b/pandora_console/extensions/update_manager/main.php @@ -39,7 +39,7 @@ function main_view() { 'admin' => array( 'active' => false, 'text' => '' . - html_print_image ("images/god7.png", + html_print_image ("images/setup.png", true, array ("title" => __('Update manager'))) .'')); ui_print_page_header (__('Update manager'), "images/extensions.png", diff --git a/pandora_console/extensions/update_manager/settings.php b/pandora_console/extensions/update_manager/settings.php index 2d3cd1ab3a..d3e6a274af 100644 --- a/pandora_console/extensions/update_manager/settings.php +++ b/pandora_console/extensions/update_manager/settings.php @@ -33,7 +33,7 @@ $buttons = array( 'admin' => array( 'active' => false, 'text' => '' . - html_print_image ("images/eye.png", + html_print_image ("images/operation.png", true, array ("title" => __('Update manager'))) .'')); ui_print_page_header (__('Update manager').' - '. __('Settings'), diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php index a2a213668f..fa49d1bd08 100644 --- a/pandora_console/godmode/agentes/module_manager.php +++ b/pandora_console/godmode/agentes/module_manager.php @@ -95,8 +95,9 @@ global $policy_page; if (!isset($policy_page)) $policy_page = false; +$show_creation = false; + if (($policy_page) || (isset($agent))) { - $show_creation = false; if ($policy_page) { $show_creation = true; } @@ -114,11 +115,6 @@ if (($policy_page) || (isset($agent))) { echo ''; echo ''; echo ''; - echo ''; - echo ""; - echo "".__("Get more modules in Pandora FMS Library").""; - echo ""; - echo ''; echo ''; echo ""; } @@ -126,6 +122,12 @@ if (($policy_page) || (isset($agent))) { echo ""; +echo '
'; +echo ""; +echo "".__("Get more modules in Pandora FMS Library").""; +echo ""; +echo '
'; + if (! isset ($id_agente)) return; diff --git a/pandora_console/godmode/agentes/module_manager_editor_plugin.php b/pandora_console/godmode/agentes/module_manager_editor_plugin.php index 3ca31b7bf2..789865a293 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_plugin.php +++ b/pandora_console/godmode/agentes/module_manager_editor_plugin.php @@ -102,6 +102,7 @@ function changePluginSelect() { }, function (data, status) { $("#plugin_description").html(data); + forced_title_callback(); } ); diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 07f1b30482..b4b2b08bb5 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -1399,7 +1399,7 @@ div.title_line { #menu_tab_left ul.mn li.nomn { background: #ababab url('../../images/tab_grey_bg.png'); - width: 380px; + width: 450px; min-width: 300px; padding: 1px 5px; diff --git a/pandora_console/operation/agentes/bulbs.php b/pandora_console/operation/agentes/bulbs.php deleted file mode 100644 index d38a460fd4..0000000000 --- a/pandora_console/operation/agentes/bulbs.php +++ /dev/null @@ -1,38 +0,0 @@ - - - ' . ui_print_status_image(STATUS_AGENT_OK, __('All Monitors OK'), true) . __('All Monitors OK') . ' - ' . ui_print_status_image(STATUS_MODULE_CRITICAL, __('At least one monitor fails'), true) . __('At least one monitor fails') . ' - ' . ui_print_status_image(STATUS_MODULE_WARNING, __('Change between Green/Red state'), true) . __('Change between Green/Red state') . ' - - ' . ui_print_status_image(STATUS_ALERT_FIRED, __('Alert fired'), true) . __('Alert fired') . ' - ' . ui_print_status_image(STATUS_ALERT_DISABLED, __('Alert disabled'), true) . __('Alerts disabled') . ' - - - - ' . ui_print_status_image(STATUS_AGENT_NO_DATA, __('Agent without data'), true) . __('Agent without data') . ' - ' . ui_print_status_image(STATUS_AGENT_DOWN, __('Agent down'), true) . __('Agent down') . ' - - ' . ui_print_status_image(STATUS_ALERT_NOT_FIRED, __('Alert not fired'), true) . __('Alert not fired') . ' - - - -'; -?>