From 38a05d2a79a6859cb32f92d9d85964488f4101f5 Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Tue, 28 Feb 2023 09:50:42 +0100 Subject: [PATCH] Events meta --- pandora_console/include/ajax/events.php | 2 +- pandora_console/include/functions_ui.php | 17 ++++---- pandora_console/operation/events/events.php | 21 +++++---- pandora_console/operation/tree.php | 48 +++++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php index 0180aca62e..b5681cdea9 100644 --- a/pandora_console/include/ajax/events.php +++ b/pandora_console/include/ajax/events.php @@ -2279,7 +2279,7 @@ if ($process_buffers === true) { '', true, true, - 'white_box white_box_opened', + 'white_box white_box_opened fixed_filter_bar', 'no-border flex-row' ); diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index a08d6f4b32..018653ccfd 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -4895,13 +4895,13 @@ function ui_print_standard_header( true ); // Create the header. - if (is_metaconsole() === true) { - $output = ui_meta_print_header( - $title, - false, - $options - ); - } else { + // if (is_metaconsole() === true) { + // $output = ui_meta_print_header( + // $title, + // false, + // $options + // ); + // } else { $output = ui_print_page_header( $title, $icon, @@ -4915,8 +4915,7 @@ function ui_print_standard_header( '', $headerInformation->printHeader(true) ); - } - + // } if ($return !== true) { echo $output; } else { diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php index 8ca05f2489..4c0a94b786 100644 --- a/pandora_console/operation/events/events.php +++ b/pandora_console/operation/events/events.php @@ -74,7 +74,8 @@ $readonly = false; ui_require_css_file('events'); ui_require_css_file('tables'); if (is_metaconsole() === true) { - ui_require_css_file('tables_meta', ENTERPRISE_DIR.'/include/styles/'); + ui_require_css_file('meta_tables', ENTERPRISE_DIR.'/meta/styles/'); + ui_require_css_file('meta_events', ENTERPRISE_DIR.'/meta/styles/'); } // Load extra javascript. @@ -1418,7 +1419,7 @@ if ($pure) { } else { if (is_metaconsole() === true) { // Load metaconsole frame. - enterprise_hook('open_meta_frame'); + // enterprise_hook('open_meta_frame'); } // Header. @@ -1567,7 +1568,12 @@ if ($pure) { break; } - if (is_metaconsole() === false) { + if (is_metaconsole() === true) { + unset($onheader['rss']); + unset($onheader['sound_event']); + unset($onheader['fullscreen']); + } + unset($onheader['history']); ui_print_standard_header( __('Events list'), @@ -1583,12 +1589,6 @@ if ($pure) { ], ] ); - } else { - unset($onheader['rss']); - unset($onheader['sound_event']); - unset($onheader['fullscreen']); - ui_meta_print_header(__('Events'), $section_string, $onheader); - } } if (enterprise_installed() === true) { @@ -2578,8 +2578,7 @@ if (check_acl( } // Close viewer. -enterprise_hook('close_meta_frame'); - +// enterprise_hook('close_meta_frame'); // Datepicker requirements. ui_require_css_file('datepicker'); ui_include_time_picker(); diff --git a/pandora_console/operation/tree.php b/pandora_console/operation/tree.php index 419652cb66..7f5eb39706 100755 --- a/pandora_console/operation/tree.php +++ b/pandora_console/operation/tree.php @@ -170,31 +170,33 @@ switch ($tab) { break; } -if (is_metaconsole() === false) { - if (!$strict_acl) { - $header_title = $header_title.' » '.$header_sub_title; - } - - ui_print_standard_header( - $header_title, - 'images/extensions.png', - false, - '', - false, - $tabs, - [ - [ - 'link' => '', - 'label' => __('Monitoring'), - ], - [ - 'link' => '', - 'label' => __('View'), - ], - ] - ); +if (is_metaconsole() === true) { + $tabs = []; } +if (!$strict_acl) { + $header_title = $header_title.' » '.$header_sub_title; +} + +ui_print_standard_header( + $header_title, + 'images/extensions.png', + false, + '', + false, + $tabs, + [ + [ + 'link' => '', + 'label' => __('Monitoring'), + ], + [ + 'link' => '', + 'label' => __('View'), + ], + ] +); + // ---------------------Tabs ------------------------------------------- // --------------------- form filter ----------------------------------- $table = new StdClass();