From e2615b9593a77eb6adb9f383a76bb06dc268d38e Mon Sep 17 00:00:00 2001 From: Jonathan Date: Tue, 21 Mar 2023 17:02:03 +0100 Subject: [PATCH] Visual changes header --- .../godmode/alerts/alert_templates.php | 34 +++++++------- .../godmode/massive/massive_operations.php | 44 +++++++++++++------ pandora_console/godmode/netflow/nf_edit.php | 8 +++- pandora_console/include/functions_menu.php | 10 +++++ pandora_console/views/calendar/edit.php | 8 +++- pandora_console/views/calendar/list.php | 22 ++++++---- .../views/calendar/special_days.php | 4 ++ 7 files changed, 86 insertions(+), 44 deletions(-) diff --git a/pandora_console/godmode/alerts/alert_templates.php b/pandora_console/godmode/alerts/alert_templates.php index 23d94b094d..51379a7820 100644 --- a/pandora_console/godmode/alerts/alert_templates.php +++ b/pandora_console/godmode/alerts/alert_templates.php @@ -122,24 +122,24 @@ $sec = (is_metaconsole() === true) ? 'advanced' : 'galertas'; // case delete_templete action is performed. if (!$delete_template) { // Header. - if (is_metaconsole() === true) { - alerts_meta_print_header(); - } else { - ui_print_standard_header( - __('Alerts'), - 'images/gm_alerts.png', - false, - '', - true, - [], + ui_print_standard_header( + __('Alerts'), + 'images/gm_alerts.png', + false, + '', + true, + [], + [ [ - [ - 'link' => '', - 'label' => __('Alert templates'), - ], - ] - ); - } + 'link' => '', + 'label' => __('Alerts'), + ], + [ + 'link' => '', + 'label' => __('Alert templates'), + ], + ] + ); } if ($update_template) { diff --git a/pandora_console/godmode/massive/massive_operations.php b/pandora_console/godmode/massive/massive_operations.php index 100b3eb933..04a2a20a2f 100755 --- a/pandora_console/godmode/massive/massive_operations.php +++ b/pandora_console/godmode/massive/massive_operations.php @@ -306,21 +306,37 @@ $onheader['snmp'] = $snmptab; $onheader['satellite'] = $satellitetab; $onheader['services'] = $servicestab; + // Header. -if (is_metaconsole() === false) { - ui_print_page_header( - __('Bulk operations').' » '.$options[$option], - 'images/gm_massive_operations.png', - false, - $help_header, - true, - $onheader, - false, - 'massivemodal' - ); -} else { - massive_meta_print_header(); -} +ui_print_standard_header( + __('Bulk operations').' - '.$options[$option], + 'images/gm_massive_operations.png', + false, + $help_header, + false, + [ + $agentstab, + $modulestab, + $pluginstab, + $userstab, + $alertstab, + $policiestab, + $snmptab, + $satellitetab, + $servicestab, + ], + [ + [ + 'link' => '', + 'label' => __('Configuration'), + ], + [ + 'link' => '', + 'label' => __('Bulk operations'), + ], + ] +); + // Checks if the PHP configuration is correctly. if ((get_cfg_var('max_execution_time') != 0) diff --git a/pandora_console/godmode/netflow/nf_edit.php b/pandora_console/godmode/netflow/nf_edit.php index 9859cb8022..2ac2c5975d 100644 --- a/pandora_console/godmode/netflow/nf_edit.php +++ b/pandora_console/godmode/netflow/nf_edit.php @@ -56,9 +56,13 @@ ui_print_standard_header( [ [ 'link' => '', - 'label' => __('Netflow'), + 'label' => __('Resources'), ], - ], + [ + 'link' => '', + 'label' => __('Netflow filters'), + ], + ] ); $is_windows = (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN'); diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php index 1d567af5cc..14c43a5c14 100644 --- a/pandora_console/include/functions_menu.php +++ b/pandora_console/include/functions_menu.php @@ -58,6 +58,16 @@ function menu_print_menu(&$menu) $sec2 = (string) get_parameter('sec2'); if ($sec2 === 'operation/agentes/ver_agente') { $sec2 = 'godmode/agentes/configurar_agente'; + } else if ($sec2 === 'godmode/alerts/configure_alert_template') { + $sec2 = 'godmode/alerts/alert_templates'; + } else if ($sec2 === 'godmode/events/events') { + $sec2 = 'godmode/events/events§ion=filter'; + } else if ($sec2 === 'godmode/alerts/configure_alert_action') { + $sec2 = 'godmode/alerts/alert_actions'; + } else if ($sec2 === 'godmode/alerts/configure_alert_command') { + $sec2 = 'godmode/alerts/alert_commands'; + } else if ($sec2 === 'enterprise/godmode/setup/edit_skin') { + $sec2 = 'enterprise/godmode/setup/setup_skins'; } else if ($sec2 === 'godmode/servers/discovery') { $wiz = (string) get_parameter('wiz'); $sec2 = 'godmode/servers/discovery&wiz='.$wiz; diff --git a/pandora_console/views/calendar/edit.php b/pandora_console/views/calendar/edit.php index 06d8b93d01..b7ec8a46ed 100644 --- a/pandora_console/views/calendar/edit.php +++ b/pandora_console/views/calendar/edit.php @@ -34,7 +34,7 @@ if (\is_metaconsole() === true) { \alerts_meta_print_header($tabs); } else { // Header. - \ui_print_standard_header( + ui_print_standard_header( __('Alerts'), 'images/gm_alerts.png', false, @@ -44,7 +44,11 @@ if (\is_metaconsole() === true) { [ [ 'link' => '', - 'label' => __('Calendars Edit'), + 'label' => __('Alerts'), + ], + [ + 'link' => '', + 'label' => __('Special days'), ], ] ); diff --git a/pandora_console/views/calendar/list.php b/pandora_console/views/calendar/list.php index 3e8e924a7d..d37a49955f 100644 --- a/pandora_console/views/calendar/list.php +++ b/pandora_console/views/calendar/list.php @@ -33,19 +33,23 @@ if (\is_metaconsole() === true) { \alerts_meta_print_header($tabs); } else { // Header. - \ui_print_page_header( - // Title. - __('Calendars'), - // Icon. + ui_print_standard_header( + __('Alerts'), 'images/gm_alerts.png', - // Return. false, - // Help. 'alert_special_days', - // Godmode. true, - // Options. - $tabs + $tabs, + [ + [ + 'link' => '', + 'label' => __('Alerts'), + ], + [ + 'link' => '', + 'label' => __('Special days'), + ], + ] ); } diff --git a/pandora_console/views/calendar/special_days.php b/pandora_console/views/calendar/special_days.php index fdf98d28b1..22ea5e3f4f 100644 --- a/pandora_console/views/calendar/special_days.php +++ b/pandora_console/views/calendar/special_days.php @@ -43,6 +43,10 @@ if (\is_metaconsole() === true) { true, $tabs, [ + [ + 'link' => '', + 'label' => __('Alerts'), + ], [ 'link' => '', 'label' => __('Special days'),