From ff3b7001c34d34833a183a4fa9fef16bc97e0cf0 Mon Sep 17 00:00:00 2001 From: daniel Date: Sat, 4 Mar 2023 13:22:52 +0100 Subject: [PATCH] fixed styles --- .../godmode/reporting/map_builder.php | 2 +- .../reporting/visual_console_builder.data.php | 15 +- .../visual_console_builder.elements.php | 56 +- .../reporting/visual_console_builder.php | 67 +-- .../visual_console_builder.wizard.php | 523 +++++++++--------- .../reporting/visual_console_favorite.php | 2 +- pandora_console/godmode/setup/license.php | 2 +- .../include/ajax/alert_list.ajax.php | 1 - .../include/functions_visual_map.php | 12 +- pandora_console/include/javascript/pandora.js | 3 +- .../lib/Dashboard/Widgets/maps_status.php | 2 +- .../rest-api/models/VisualConsole/Item.php | 10 +- pandora_console/include/styles/alert.css | 13 + pandora_console/include/styles/dashboards.css | 22 - pandora_console/include/styles/pandora.css | 10 +- .../include/styles/visual_maps.css | 3 +- .../include/visual-console-client/vc.main.css | 4 +- .../operation/visual_console/legacy_view.php | 8 +- .../operation/visual_console/view.php | 71 ++- 19 files changed, 411 insertions(+), 415 deletions(-) diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php index b096226db4..898c3becda 100644 --- a/pandora_console/godmode/reporting/map_builder.php +++ b/pandora_console/godmode/reporting/map_builder.php @@ -513,7 +513,7 @@ if (!$maps && is_metaconsole() === false) { if (is_metaconsole() === false) { $data[0] = ''.$map['name'].''; } else { - $data[0] = ''.$map['name'].''; + $data[0] = ''.$map['name'].''; } $data[1] = ui_print_group_icon($map['id_group'], true); diff --git a/pandora_console/godmode/reporting/visual_console_builder.data.php b/pandora_console/godmode/reporting/visual_console_builder.data.php index ec0d805066..a27eb6ff67 100644 --- a/pandora_console/godmode/reporting/visual_console_builder.data.php +++ b/pandora_console/godmode/reporting/visual_console_builder.data.php @@ -82,7 +82,7 @@ switch ($action) { echo "
"; html_print_input_hidden('action', 'update'); } else { - echo ""; + echo ""; html_print_input_hidden('action2', 'update'); } break; @@ -136,14 +136,8 @@ echo $formHidden; $table = new stdClass(); $table->width = '100%'; -if (is_metaconsole() === true) { - $table->class = 'databox data'; - $table->head[0] = __('Create visual console'); - $table->head_colspan[0] = 5; - $table->headstyle[0] = 'text-align: center'; - $table->align[0] = 'left'; - $table->align[1] = 'left'; -} + + $table->class = 'databox filter-table-adv'; $table->size = []; @@ -152,6 +146,9 @@ $table->size[1] = '50%'; $table->data = []; +$table->colspan[-1][0] = 2; +$table->data[-1][0] = '
'.__('Create visual console').'
'; + $table->data[0][] = html_print_label_input_block( __('Name'), html_print_input_text( diff --git a/pandora_console/godmode/reporting/visual_console_builder.elements.php b/pandora_console/godmode/reporting/visual_console_builder.elements.php index 5cc9d93bd0..1fba8bcc9a 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.elements.php +++ b/pandora_console/godmode/reporting/visual_console_builder.elements.php @@ -113,7 +113,7 @@ foreach ($all_images as $image_file) { $table = new stdClass(); $table->width = '100%'; -$table->class = 'databox data'; +$table->class = 'databox filter-table-adv'; $table->head = []; $table->head['icon'] = ''; @@ -783,23 +783,47 @@ foreach ($layoutDatas as $layoutData) { $pure = get_parameter('pure', 0); if (is_metaconsole() === false) { - echo ''; + echo ''; html_print_input_hidden('action', 'update'); } else { - echo ""; + echo ""; html_print_input_hidden('action2', 'update'); } html_print_table($table); +// Form for multiple delete. +if (is_metaconsole() === false) { + $url_multiple_delete = 'index.php?sec=network&sec2=godmode/reporting/visual_console_builder&tab='.$activeTab.'&id_visual_console='.$visualConsole['id']; +} else { + $url_multiple_delete = 'index.php?sec=screen&sec2=screens/screens&action=visualmap&tab='.$activeTab.'&id_visual_console='.$visualConsole['id']; +} + +echo '
'; + $buttons = html_print_submit_button( __('Update'), 'go', false, - [ 'icon' => 'next' ], + [ + 'icon' => 'next', + 'form' => 'vc_elem_form', + ], true ); +$buttons .= "'; diff --git a/pandora_console/godmode/reporting/visual_console_favorite.php b/pandora_console/godmode/reporting/visual_console_favorite.php index 4f12802a90..1724a241a9 100644 --- a/pandora_console/godmode/reporting/visual_console_favorite.php +++ b/pandora_console/godmode/reporting/visual_console_favorite.php @@ -242,7 +242,7 @@ if ($favorite_array == false) { echo "