From 31905f005a1266c7cb7e97c21071bb907ec71be4 Mon Sep 17 00:00:00 2001 From: Tatiana Llorente Date: Tue, 11 Jun 2019 17:34:13 +0200 Subject: [PATCH] Visual changes in Agent/Module View - #3739 --- pandora_console/extensions/agents_modules.php | 85 ++++++++++-------- pandora_console/images/arrow_left_green.png | Bin 0 -> 276 bytes pandora_console/include/styles/pandora.css | 21 ++++- 3 files changed, 63 insertions(+), 43 deletions(-) create mode 100644 pandora_console/images/arrow_left_green.png diff --git a/pandora_console/extensions/agents_modules.php b/pandora_console/extensions/agents_modules.php index 93936f3775..7e5e41155e 100644 --- a/pandora_console/extensions/agents_modules.php +++ b/pandora_console/extensions/agents_modules.php @@ -81,6 +81,8 @@ function mainAgentsModules() $full_agents_id = explode(';', get_parameter('full_agents_id', 0)); if ($save_serialize == 0 && $update_item == '') { + // manu ha puesto esto para que funcione la pantalla completa + // if ($save_serialize && $update_item == '') { // Pero debe estar asi (como antes) para que funcione la paginacion de la propia tabla $unserialize_modules_selected = unserialize_in_temp($config['id_user'].'_agent_module', true, 1); $unserialize_agents_id = unserialize_in_temp($config['id_user'].'_agents', true, 1); if ($unserialize_modules_selected) { @@ -261,30 +263,30 @@ function mainAgentsModules() } if ($config['pure'] != 1) { - echo '
'; - - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo "'; - echo ''; - echo '
'.$filter_groups_label.''.$filter_groups.'   '.$filter_recursion_label.$filter_recursion.''.$filter_module_groups_label.''.$filter_module_groups.'
'.$filter_agents_label.''.$filter_agents.''.$filter_type_show_label.''.$filter_type_show.''.$filter_modules_label.''.$filter_modules.'
".$filter_update.'
'; - echo '
'; + $show_filters = '
'; + $show_filters .= ''; + $show_filters .= ''; + $show_filters .= ''; + $show_filters .= ''; + $show_filters .= ''; + $show_filters .= ''; + $show_filters .= ''; + $show_filters .= ''; + $show_filters .= ''; + $show_filters .= ''; + $show_filters .= ''; + $show_filters .= ''; + $show_filters .= ''; + $show_filters .= ''; + $show_filters .= ''; + $show_filters .= ''; + $show_filters .= ''; + $show_filters .= ''; + $show_filters .= "'; + $show_filters .= ''; + $show_filters .= '
'.$filter_groups_label.''.$filter_groups.'   '.$filter_recursion_label.$filter_recursion.''.$filter_module_groups_label.''.$filter_module_groups.'
'.$filter_agents_label.''.$filter_agents.''.$filter_type_show_label.''.$filter_type_show.''.$filter_modules_label.''.$filter_modules.'
".$filter_update.'
'; + $show_filters .= '
'; + ui_toggle($show_filters, __('Filters')); } if ($agents_id[0] != -1) { @@ -430,8 +432,8 @@ function mainAgentsModules() if ($hor_offset > 0) { $new_hor_offset = ($hor_offset - $block); - echo "".html_print_image( - 'images/arrow_left.png', + echo "".html_print_image( + 'images/arrow_left_green.png', true, ['title' => __('Previous modules')] ).''; @@ -456,8 +458,8 @@ function mainAgentsModules() if (($hor_offset + $block) < $nmodules) { $new_hor_offset = ($hor_offset + $block); - echo "".html_print_image( - 'images/arrow.png', + echo "".html_print_image( + 'images/arrow_right_green.png', true, ['title' => __('More modules')] ).''; @@ -588,18 +590,23 @@ function mainAgentsModules() echo ''; - echo "
"; + $show_legend = "
"; + $show_legend .= "
+
".__('Orange cell when the module has fired alerts').'
'; + $show_legend .= "
+
".__('Red cell when the module has a critical status').' +
'; + $show_legend .= "
+
".__('Yellow cell when the module has a warning status').'
'; + $show_legend .= "
+
".__('Green cell when the module has a normal status').'
'; + $show_legend .= "
+
".__('Grey cell when the module has an unknown status').'
'; + $show_legend .= "
+
".__("Cell turns blue when the module is in 'not initialize' status").'
'; + $show_legend .= '
'; + ui_toggle($show_legend, __('Legend')); - echo ''; - echo "'; - echo "'; - echo "'; - echo "'; - echo "'; - echo "'; - echo "'; - echo '
".__('Legend').'
".__('Orange cell when the module has fired alerts').'
".__('Red cell when the module has a critical status').'
".__('Yellow cell when the module has a warning status').'
".__('Green cell when the module has a normal status').'
".__('Grey cell when the module has an unknown status').'
".__("Cell turns blue when the module is in 'not initialize' status").'
'; - echo '
'; $pure_var = $config['pure']; if ($pure_var) { $pure_var = 1; diff --git a/pandora_console/images/arrow_left_green.png b/pandora_console/images/arrow_left_green.png new file mode 100644 index 0000000000000000000000000000000000000000..b6aadc9639d17a2c4ae015937da83fd580cb939d GIT binary patch literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^f|6H_V+Po~-c6>al$aSW-rm6W0&r1JKW5JM23LrucG+uQk16#1w~Y>@A` z-khN^zruL}k3j=hV+QLY-h)XD94btEiy0$jl_lA99Kug~tYnPfRlLf;<9x!9A^O0i z9EL9MhIIuEQcTPXT%LOPST*ftS@Dozg44FEj2Rzll6Ve^ZBXdt^l;*C5L20y!ePnw z&^yOP`iO_ZP2p4lWkJaa3mkh~#8_XjSvn<8u5iA