From 2cb72f532c8fff16938a5a57c091a619475d57d8 Mon Sep 17 00:00:00 2001 From: "jose.gonzalez@pandorafms.com" Date: Wed, 26 Oct 2022 17:00:54 +0200 Subject: [PATCH] Adapted views --- .../reporting/visual_console_builder.data.php | 168 ++++++++++-------- .../visual_console_builder.editor.php | 92 +++++----- .../visual_console_builder.elements.php | 105 +++++++---- .../visual_console_builder.wizard.php | 66 ++++--- pandora_console/operation/events/events.php | 31 +++- .../operation/visual_console/view.php | 9 +- 6 files changed, 290 insertions(+), 181 deletions(-) diff --git a/pandora_console/godmode/reporting/visual_console_builder.data.php b/pandora_console/godmode/reporting/visual_console_builder.data.php index 2c5f1f4ce0..e272d346c6 100644 --- a/pandora_console/godmode/reporting/visual_console_builder.data.php +++ b/pandora_console/godmode/reporting/visual_console_builder.data.php @@ -1,40 +1,52 @@ "; html_print_input_hidden('action', 'save'); } else { @@ -66,18 +78,18 @@ switch ($action) { case 'update': case 'save': - if (!defined('METACONSOLE')) { + if (is_metaconsole() === false) { echo "
"; html_print_input_hidden('action', 'update'); } else { - // echo ''; echo ""; html_print_input_hidden('action2', 'update'); } break; case 'edit': - if (!defined('METACONSOLE')) { + default: + if (is_metaconsole() === false) { echo ""; html_print_input_hidden('action', 'update'); } else { @@ -89,7 +101,7 @@ switch ($action) { $table = new stdClass(); $table->width = '100%'; -if (defined('METACONSOLE')) { +if (is_metaconsole() === true) { $table->class = 'databox data'; $table->head[0] = __('Create visual console'); $table->head_colspan[0] = 5; @@ -100,8 +112,8 @@ if (defined('METACONSOLE')) { $table->class = 'databox filters'; $table->size[0] = '20%'; -$table->size[1] = '20%'; -$table->size[1] = '50%'; +$table->size[1] = '100%'; +$table->style[1] = 'display: flex;flex-direction: row;flex-wrap: wrap;align-items: center;'; $table->data = []; $table->data[0][0] = __('Name:').ui_print_help_tip(__("Use [ or ( as first character, for example '[*] Map name', to render this map name in main menu"), true); @@ -115,13 +127,11 @@ $table->data[0][1] = html_print_input_text( ); $table->rowspan[0][2] = 6; -if ($action == 'new') { - $table->data[0][2] = ''; - $table->data[0][2] .= ''; +if ($action === 'new') { + $table->data[0][2] = ''; + $table->data[0][2] .= ''; } else { - if (defined('METACONSOLE')) { + if (is_metaconsole() === true) { $table->data[0][2] = ''; } else { @@ -129,8 +139,7 @@ if ($action == 'new') { src="images/console/background/'.$background.'">'; } - $table->data[0][2] .= ''; + $table->data[0][2] .= ''; } $table->data[1][0] = __('Group'); @@ -210,14 +219,35 @@ if ($idVisualConsole) { $table->data[5][0] = __('Layout size').': '.$preimagew.' x '.$preimageh.''; -$table->data[5][1] = ''; +$table->data[5][1] = html_print_button( + __('Set custom size'), + 'modsize', + false, + '', + [ + 'icon' => 'cog', + 'mode' => 'link', + 'value' => 'modsize', + ], + true +); $table->data[5][1] .= ''; -$table->data[5][1] .= ''; +$table->data[5][1] .= ''; $table->data[6][0] = __('Favourite visual console'); $table->data[6][1] = html_print_checkbox('is_favourite', 0, $is_favourite, true); @@ -225,24 +255,28 @@ $table->data[6][1] = html_print_checkbox('is_favourite', 0, $is_favourite, true) $table->data[7][0] = __('Auto adjust to screen in fullscreen'); $table->data[7][1] = html_print_checkbox('auto_adjust', 0, $auto_adjust, true); -if ($action == 'new') { +if ($action === 'new') { $textButtonSubmit = __('Save'); - $classButtonSubmit = 'sub wand'; + $classButtonSubmit = 'wand'; } else { $textButtonSubmit = __('Update'); - $classButtonSubmit = 'sub upd'; + $classButtonSubmit = 'update'; } html_print_table($table); -echo '
'; -html_print_submit_button( - $textButtonSubmit, - 'update_layout', - false, - 'class="'.$classButtonSubmit.'"' +html_print_div( + [ + 'class' => 'action-buttons', + 'content' => html_print_submit_button( + $textButtonSubmit, + 'update_layout', + false, + [ 'icon' => $classButtonSubmit ], + true + ), + ] ); -echo '
'; echo '
'; ui_require_css_file('color-picker', 'include/styles/js/'); @@ -252,15 +286,14 @@ ui_require_jquery_file('colorpicker'); diff --git a/pandora_console/godmode/reporting/visual_console_builder.elements.php b/pandora_console/godmode/reporting/visual_console_builder.elements.php index 61674f9012..e969d08379 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.elements.php +++ b/pandora_console/godmode/reporting/visual_console_builder.elements.php @@ -1,22 +1,38 @@ '; -} else { - echo "
"; -} - -if (!defined('METACONSOLE')) { - echo '
'; -} - -if (!defined('METACONSOLE')) { html_print_input_hidden('action', 'update'); } else { + echo ""; html_print_input_hidden('action2', 'update'); } html_print_table($table); -echo '
'; -html_print_submit_button(__('Update'), 'go', false, 'class="sub next"'); -echo ' '; -html_print_button(__('Delete'), 'delete', false, 'submit_delete_multiple_items();', 'class="sub delete"'); -echo '
'; +$buttons = html_print_submit_button( + __('Update'), + 'go', + false, + [ 'icon' => 'next' ], + true +); + +$buttons .= html_print_button( + __('Delete'), + 'delete', + false, + 'submit_delete_multiple_items();', + [ + 'icon' => 'delete', + 'mode' => 'secondary', + ], + true +); + +html_print_div( + [ + 'class' => 'action-buttons', + 'content' => $buttons, + ] +); + echo ''; -// Form for multiple delete -if (!defined('METACONSOLE')) { - $url_multiple_delete = 'index.php?'.'sec=network&'.'sec2=godmode/reporting/visual_console_builder&'.'tab='.$activeTab.'&'.'id_visual_console='.$visualConsole['id']; - - echo '
'; +// 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?'.'operation=edit_visualmap&'.'sec=screen&'.'sec2=screens/screens&'.'action=visualmap&'.'pure=0&'.'tab=list_elements&'.'id_visual_console='.$idVisualConsole; - - echo "'.html -if (is_metaconsole()) { +if (is_metaconsole() === true) { $pure = get_parameter('pure', 0); echo ''; } -if (defined('METACONSOLE')) { +if (is_metaconsole() === true) { echo "
".__('Wizard').'
'; } html_print_table($table); -echo '
'; -if (is_metaconsole()) { +if (is_metaconsole() === true) { html_print_input_hidden('action2', 'update'); } else { html_print_input_hidden('action', 'update'); } html_print_input_hidden('id_visual_console', $visualConsole['id']); -html_print_submit_button(__('Add'), 'go', false, 'class="sub wizard wand"'); -echo '
'; +html_print_div( + [ + 'class' => 'action-buttons', + 'content' => html_print_submit_button( + __('Add'), + 'go', + false, + [ 'icon' => 'wand' ], + true + ), + ] +); + echo '
'; // Trick for it have a traduct text for javascript. diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php index e289632aad..0fd926acdb 100644 --- a/pandora_console/operation/events/events.php +++ b/pandora_console/operation/events/events.php @@ -2374,25 +2374,38 @@ if (check_acl( echo '
'; echo '
'; echo ''; - html_print_select( + + $elements = html_print_button( + __('Execute event response'), + 'submit_event_response', + false, + 'execute_event_response(true);', + [ + 'icon' => 'cog', + 'mode' => 'mini', + ], + true + ); + + $elements .= html_print_select( $array_events_actions, 'response_id', '', '', '', 0, - false, + true, false, false ); - echo '  '; - html_print_button( - __('Execute event response'), - 'submit_event_response', - false, - 'execute_event_response(true);', - 'class="sub next"' + + html_print_div( + [ + 'class' => 'action-buttons', + 'content' => $elements, + ] ); + echo "