From b34515d03c0b95819af50325835af836334f46b3 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 23 Feb 2023 17:57:48 +0100 Subject: [PATCH] restyling --- pandora_console/include/styles/pandora.css | 1 + .../agentes/alerts_status.functions.php | 149 +++++++++++++----- .../operation/agentes/alerts_status.php | 16 +- 3 files changed, 115 insertions(+), 51 deletions(-) diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 0250eba3cf..37bc5d6055 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -10826,6 +10826,7 @@ tr.bring_next_field { left: 250px; display: flex; align-items: center; + margin-left: 20px; } .action_buttons_right_content div { diff --git a/pandora_console/operation/agentes/alerts_status.functions.php b/pandora_console/operation/agentes/alerts_status.functions.php index f77b6a4daf..0ce63a9aa3 100755 --- a/pandora_console/operation/agentes/alerts_status.functions.php +++ b/pandora_console/operation/agentes/alerts_status.functions.php @@ -63,33 +63,35 @@ function printFormFilterAlert($id_group, $filter, $free_search, $url, $filter_st $table = new StdClass(); $table->width = '100%'; - $table->class = 'databox filters no-border'; - $table->cellpadding = '0'; - $table->cellspacing = '0'; - if (defined('METACONSOLE')) { - $table->class = 'databox filters no-border'; - $table->width = '100%'; - $table->cellpadding = '0'; - $table->cellspacing = '0'; - } - + $table->class = 'filter-table-adv'; + $table->size = []; + $table->size[0] = '33%'; + $table->size[1] = '33%'; + $table->size[2] = '33%'; $table->data = []; - $table->style = []; - $table->style[0] = 'font-weight: bold;'; - $table->style[1] = 'font-weight: bold;'; - $table->style[2] = 'font-weight: bold;'; - $table->style[3] = 'font-weight: bold;'; - $table->style[4] = 'font-weight: bold;'; - if (defined('METACONSOLE')) { - $table->style[0] = 'font-weight: bold;'; - $table->style[1] = 'font-weight: bold;'; - $table->style[2] = 'font-weight: bold;'; - $table->style[3] = 'font-weight: bold;'; - $table->style[4] = 'font-weight: bold;'; - } - - $table->data[0][0] = __('Group'); - $table->data[0][1] = html_print_select_groups($config['id_user'], $access, true, 'ag_group', $id_group, '', '', '', true, false, false, '', false, '', false, false, 'id_grupo', $strict_user); + $table->data[0][0] = html_print_label_input_block( + __('Group'), + html_print_select_groups( + $config['id_user'], + $access, + true, + 'ag_group', + $id_group, + '', + '', + '', + true, + false, + false, + '', + false, + '', + false, + false, + 'id_grupo', + $strict_user + ) + ); $alert_status_filter = []; $alert_status_filter['all_enabled'] = __('All (Enabled)'); @@ -102,32 +104,93 @@ function printFormFilterAlert($id_group, $filter, $free_search, $url, $filter_st $alert_standby['1'] = __('Standby on'); $alert_standby['0'] = __('Standby off'); - $table->data[0][2] = __('Status'); - $table->data[0][3] = html_print_select($alert_status_filter, 'disabled', $filter, '', '', '', true); - - $table->data[0][4] = __('Tags').ui_print_help_tip(__('Only it is show tags in use.'), true); + $table->data[0][1] = html_print_label_input_block( + __('Status'), + html_print_select( + $alert_status_filter, + 'disabled', + $filter, + '', + '', + '', + true, + false, + true, + '', + false, + 'width: 100%;' + ) + ); $tags = tags_get_user_tags(); - - if (empty($tags)) { - $table->data[0][5] .= html_print_input_text('tags', __('No tags'), '', 20, 40, true, true); + if (empty($tags) === true) { + $callbackTag = html_print_input_text('tags', __('No tags'), '', 20, 40, true, true); } else { - $table->data[0][5] .= html_print_select($tags, 'tag', $tag_filter, '', __('All'), '', true, false, true, '', false, 'width: 150px;'); + $callbackTag = html_print_select( + $tags, + 'tag', + $tag_filter, + '', + __('All'), + '', + true, + false, + true, + '', + false, + 'width: 100%;' + ); } - $table->data[1][0] = __('Free text for search').ui_print_help_tip( - __('Filter by agent name, module name, template name or action name'), - true + $table->data[0][2] = html_print_label_input_block( + __('Tags').ui_print_help_tip(__('Only it is show tags in use.'), true), + $callbackTag ); - $table->data[1][1] = html_print_input_text('free_search', $free_search, '', 20, 40, true); - $table->data[1][2] = __('Standby'); - $table->data[1][3] = html_print_select($alert_standby, 'standby', $filter_standby, '', __('All'), '', true); + $table->data[1][0] = html_print_label_input_block( + __('Free text for search').ui_print_help_tip( + __('Filter by agent name, module name, template name or action name'), + true + ), + html_print_input_text('free_search', $free_search, '', 20, 40, true) + ); + + $table->data[1][1] = html_print_label_input_block( + __('Standby'), + html_print_select( + $alert_standby, + 'standby', + $filter_standby, + '', + __('All'), + '', + true, + false, + true, + '', + false, + 'width: 100%;' + ) + ); - $table->data[1][4] = __('Action'); $alert_action = alerts_get_alert_actions_filter(); - - $table->data[1][5] = html_print_select($alert_action, 'action', $action_filter, '', __('All'), '', true); + $table->data[1][2] = html_print_label_input_block( + __('Action'), + html_print_select( + $alert_action, + 'action', + $action_filter, + '', + __('All'), + '', + true, + false, + true, + '', + false, + 'width: 100%;' + ) + ); $data .= html_print_table($table, true); diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php index f23f0e668e..15340d2130 100755 --- a/pandora_console/operation/agentes/alerts_status.php +++ b/pandora_console/operation/agentes/alerts_status.php @@ -530,18 +530,18 @@ if ($agent_view_page === true) { echo $html_content; } - // Strict user hidden. - echo ''; - enterprise_hook('close_meta_frame'); +enterprise_hook('close_meta_frame'); - ui_require_css_file('cluetip', 'include/styles/js/'); - ui_require_jquery_file('cluetip'); +ui_require_css_file('cluetip', 'include/styles/js/'); +ui_require_jquery_file('cluetip'); ?>