From bac1a7bf654b238a753e5bac8ecb80b584e7ef5e Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 23 Mar 2023 17:44:06 +0100 Subject: [PATCH] fixed styles --- .../reporting/visual_console_builder.data.php | 2 -- .../godmode/reporting/visual_console_builder.php | 12 +++++++----- pandora_console/operation/visual_console/view.php | 7 +++++-- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pandora_console/godmode/reporting/visual_console_builder.data.php b/pandora_console/godmode/reporting/visual_console_builder.data.php index a27eb6ff67..e2a50b4474 100644 --- a/pandora_console/godmode/reporting/visual_console_builder.data.php +++ b/pandora_console/godmode/reporting/visual_console_builder.data.php @@ -137,8 +137,6 @@ echo $formHidden; $table = new stdClass(); $table->width = '100%'; - - $table->class = 'databox filter-table-adv'; $table->size = []; $table->size[0] = '50%'; diff --git a/pandora_console/godmode/reporting/visual_console_builder.php b/pandora_console/godmode/reporting/visual_console_builder.php index dfc73b8f67..e543623553 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.php +++ b/pandora_console/godmode/reporting/visual_console_builder.php @@ -63,7 +63,7 @@ if (empty($idVisualConsole) === true) { $idVisualConsole = get_parameter('id', 0); } -if (!defined('METACONSOLE')) { +if (is_metaconsole() === false) { $action_name_parameter = 'action'; } else { $action_name_parameter = 'action2'; @@ -93,7 +93,6 @@ $activeTab = get_parameterBetweenListValues( 'data' ); - // Visual console creation tab and actions. if (empty($idVisualConsole)) { $visualConsole = null; @@ -137,7 +136,6 @@ $refr = (int) get_parameter('refr', $config['vc_refr']); $id_layout = 0; - // Save/Update data in DB global $statusProcessInDB; if (empty($statusProcessInDB)) { @@ -798,14 +796,18 @@ if (!defined('METACONSOLE')) { $hash = User::generatePublicHash(); $buttons = []; - $buttons['consoles_list'] = [ 'active' => false, 'text' => ''.html_print_image('images/logs@svg.svg', true, ['title' => __('Visual consoles list'), 'class' => 'main_menu_icon invert_filter']).'', ]; $buttons['public_link'] = [ 'active' => false, - 'text' => ''.html_print_image('images/item-icon.svg', true, ['title' => __('Show link to public Visual Console'), 'class' => 'main_menu_icon invert_filter']).'', + 'text' => ''.html_print_image('images/item-icon.svg', true, ['title' => __('Show link to public Visual Console'), 'class' => 'main_menu_icon invert_filter']).'', ]; $buttons['data'] = [ 'active' => false, diff --git a/pandora_console/operation/visual_console/view.php b/pandora_console/operation/visual_console/view.php index fde52505d1..6c3214b95a 100644 --- a/pandora_console/operation/visual_console/view.php +++ b/pandora_console/operation/visual_console/view.php @@ -141,12 +141,15 @@ if ($aclWrite === true || $aclManage === true) { 'edit' ); - $baseUrl = 'index.php?sec=network&sec2=godmode/reporting/visual_console_builder&action='.$action; + $baseUrl = 'index.php?sec=network&sec2=godmode/reporting/visual_console_builder&'.((is_metaconsole() === true) ? 'action2' : 'action').'='.$action; $hash = md5($config['dbpass'].$visualConsoleId.$config['id_user']); $options['public_link']['text'] = ''.html_print_image( 'images/item-icon.svg', true,