From 426690bc359885494f4ccc63b08a7e9bd0c0b5d2 Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Fri, 31 Mar 2023 10:44:51 +0200 Subject: [PATCH] 10843 & 10844 --- .../reporting/graph_builder.graph_editor.php | 253 ++++++++++-------- pandora_console/include/functions_html.php | 72 ++--- pandora_console/include/functions_ui.php | 50 ++-- pandora_console/include/styles/pandora.css | 12 + .../operation/agentes/alerts_status.php | 8 +- 5 files changed, 220 insertions(+), 175 deletions(-) diff --git a/pandora_console/godmode/reporting/graph_builder.graph_editor.php b/pandora_console/godmode/reporting/graph_builder.graph_editor.php index aed04e3089..d6e5b3d75b 100644 --- a/pandora_console/godmode/reporting/graph_builder.graph_editor.php +++ b/pandora_console/godmode/reporting/graph_builder.graph_editor.php @@ -204,9 +204,142 @@ if ($count_module_array > $config['items_combined_charts']) { ); } +$table = new stdClass(); +$table->width = '100%'; +$table->colspan[0][0] = 3; +$table->size = []; + +if (defined('METACONSOLE')) { + $table->class = 'databox data'; + $table->head[0] = __('Sort items'); + $table->head_colspan[0] = 4; + $table->headstyle[0] = 'text-align: center'; + $table->size[0] = '25%'; + $table->size[1] = '25%'; + $table->size[2] = '25%'; + $table->size[3] = '25%'; +} else { + $table->class = 'filter-table-adv'; + $table->size[0] = '50%'; + $table->size[1] = '50%'; +} + +$table->data[0][0] = html_print_label_input_block( + __('Sort selected items'), + html_print_select_style( + [ + 'before' => __('before to'), + 'after' => __('after to'), + ], + 'move_to', + '', + '', + '', + '', + 0, + true + ) +); +$table->data[0][1] = html_print_label_input_block( + __('Position'), + html_print_input_text_extended( + 'position_to_sort', + 1, + 'text-position_to_sort', + '', + 3, + 10, + false, + "only_numbers('position_to_sort');", + '', + true + ).html_print_input_hidden('ids_items_to_sort', '', true) +); + + +$SortItems = "
"; +$SortItems .= html_print_table($table, true); +$SortItems .= html_print_input_hidden('action', 'sort_items', true); +$SortItems .= html_print_div( + [ + 'class' => 'action-buttons', + 'content' => html_print_submit_button( + __('Sort'), + 'srcbutton', + false, + [ + 'class' => 'mini', + 'icon' => 'search', + 'mode' => 'secondary', + ], + true + ), + ], + true +); +$SortItems .= '
'; + +ui_toggle( + $SortItems, + ''.__('Sort items').'', + '', + '', + false, + false, + '', + 'white-box-content no_border', + 'filter-datatable-main box-flat white_table_graph max_floating_element_size' +); + + +// Configuration form. +echo ''; +echo "
"; + +echo ""; +echo ''; +echo ''; +echo ''; +echo "'; +echo ''; +echo ""; +echo '
'.html_print_input( + [ + 'type' => 'select_multiple_modules_filtered', + 'uniqId' => 'modules', + 'class' => 'flex flex-row', + 'searchBar' => true, + ] +).'
"; +echo ""; +echo ''; +echo '
'; +echo html_print_label_input_block( + __('Weight'), + '' +); +echo '
'; +echo '
'; +$ActionButtons[] = html_print_submit_button( + __('Add'), + 'submit-add', + false, + [ + 'class' => 'sub ok', + 'icon' => 'next', + ], + true +); +html_print_action_buttons( + implode('', $ActionButtons), + ['type' => 'form_action'] +); + +echo '
'; + // Modules table. if ($count_module_array > 0) { - echo ""; + echo "
"; echo ' @@ -290,124 +423,6 @@ if ($count_module_array > 0) { echo '
'.__('P.').' '.__('Agent').'
'; } - -$table = new stdClass(); -$table->width = '100%'; -$table->colspan[0][0] = 3; -$table->size = []; - -if (defined('METACONSOLE')) { - $table->class = 'databox data'; - $table->head[0] = __('Sort items'); - $table->head_colspan[0] = 4; - $table->headstyle[0] = 'text-align: center'; - $table->size[0] = '25%'; - $table->size[1] = '25%'; - $table->size[2] = '25%'; - $table->size[3] = '25%'; -} else { - $table->class = 'filter-table-adv'; - $table->size[0] = '50%'; - $table->size[1] = '50%'; -} - -$table->data[0][0] = html_print_label_input_block( - __('Sort selected items'), - html_print_select_style( - [ - 'before' => __('before to'), - 'after' => __('after to'), - ], - 'move_to', - '', - '', - '', - '', - 0, - true - ) -); -$table->data[0][1] = html_print_label_input_block( - __('Position'), - html_print_input_text_extended( - 'position_to_sort', - 1, - 'text-position_to_sort', - '', - 3, - 10, - false, - "only_numbers('position_to_sort');", - '', - true - ).html_print_input_hidden('ids_items_to_sort', '', true) -); - - -$SortItems = "
"; -$SortItems .= html_print_table($table, true); -$SortItems .= html_print_input_hidden('action', 'sort_items', true); -$SortItems .= html_print_div( - [ - 'class' => 'action-buttons', - 'content' => html_print_submit_button( - __('Sort'), - 'srcbutton', - false, - [ - 'class' => 'mini', - 'icon' => 'search', - 'mode' => 'secondary', - ], - true - ), - ], - true -); -$SortItems .= '
'; - -ui_toggle($SortItems, __('Sort items'), '', '', false); - - -// Configuration form. -echo ''; -echo "
"; - -echo ""; -echo ''; -echo ''; -echo ''; -echo "'; -echo ''; -echo ""; -echo '
'.html_print_input( - [ - 'type' => 'select_multiple_modules_filtered', - 'uniqId' => 'modules', - 'class' => 'flex flex-row', - 'searchBar' => true, - ] -).'
"; -echo ""; -echo ''; -echo ""; -echo '
'.__('Weight').'
'; -echo '
'; -$ActionButtons[] = html_print_submit_button( - __('Add'), - 'submit-add', - false, - [ - 'class' => 'sub ok', - 'icon' => 'next', - ], - true -); -html_print_action_buttons( - implode('', $ActionButtons), - ['type' => 'form_action'] -); - ui_require_jquery_file('pandora.controls'); ui_require_jquery_file('ajaxqueue'); ui_require_jquery_file('bgiframe'); diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php index a1b12f1ff3..46132168aa 100644 --- a/pandora_console/include/functions_html.php +++ b/pandora_console/include/functions_html.php @@ -1559,6 +1559,7 @@ function html_print_select_multiple_modules_filtered(array $data):string $output .= html_print_input( [ 'label' => __('Group'), + 'label_class' => 'font-title-font', 'name' => 'filtered-module-group-'.$uniqId, 'returnAllGroup' => $return_all_group, 'privilege' => 'AR', @@ -1572,14 +1573,15 @@ function html_print_select_multiple_modules_filtered(array $data):string // Recursion. $output .= html_print_input( [ - 'label' => __('Recursion'), - 'type' => 'switch', - 'name' => 'filtered-module-recursion-'.$uniqId, - 'value' => (empty($data['mRecursion']) === true) ? false : true, - 'checked' => (empty($data['mRecursion']) === true) ? false : true, - 'return' => true, - 'id' => 'filtered-module-recursion-'.$uniqId, - 'onchange' => 'fmAgentChange(\''.$uniqId.'\')', + 'label' => __('Recursion'), + 'label_class' => 'font-title-font', + 'type' => 'switch', + 'name' => 'filtered-module-recursion-'.$uniqId, + 'value' => (empty($data['mRecursion']) === true) ? false : true, + 'checked' => (empty($data['mRecursion']) === true) ? false : true, + 'return' => true, + 'id' => 'filtered-module-recursion-'.$uniqId, + 'onchange' => 'fmAgentChange(\''.$uniqId.'\')', ] ); @@ -1598,6 +1600,7 @@ function html_print_select_multiple_modules_filtered(array $data):string $output .= html_print_input( [ 'label' => __('Module group'), + 'label_class' => 'font-title-font', 'type' => 'select', 'fields' => $module_groups, 'name' => 'filtered-module-module-group-'.$uniqId, @@ -1682,15 +1685,16 @@ function html_print_select_multiple_modules_filtered(array $data):string $output .= html_print_input( [ - 'label' => __('Agents'), - 'type' => 'select', - 'fields' => $agents, - 'name' => 'filtered-module-agents-'.$uniqId, - 'selected' => explode(',', $data['mAgents']), - 'return' => true, - 'multiple' => true, - 'style' => 'min-width: 200px;max-width:200px;', - 'script' => 'fmModuleChange(\''.$uniqId.'\', '.(int) is_metaconsole().')', + 'label' => __('Agents'), + 'label_class' => 'font-title-font', + 'type' => 'select', + 'fields' => $agents, + 'name' => 'filtered-module-agents-'.$uniqId, + 'selected' => explode(',', $data['mAgents']), + 'return' => true, + 'multiple' => true, + 'style' => 'min-width: 200px;max-width:200px;', + 'script' => 'fmModuleChange(\''.$uniqId.'\', '.(int) is_metaconsole().')', ] ); @@ -1701,14 +1705,15 @@ function html_print_select_multiple_modules_filtered(array $data):string $output .= html_print_input( [ - 'label' => __('Only common modules'), - 'type' => 'switch', - 'checked' => $commonModules, - 'value' => $commonModules, - 'name' => 'filtered-module-show-common-modules-'.$uniqId, - 'id' => 'filtered-module-show-common-modules-'.$uniqId, - 'return' => true, - 'onchange' => 'fmModuleChange(\''.$uniqId.'\', '.(int) is_metaconsole().')', + 'label' => __('Only common modules'), + 'label_class' => 'font-title-font', + 'type' => 'switch', + 'checked' => $commonModules, + 'value' => $commonModules, + 'name' => 'filtered-module-show-common-modules-'.$uniqId, + 'id' => 'filtered-module-show-common-modules-'.$uniqId, + 'return' => true, + 'onchange' => 'fmModuleChange(\''.$uniqId.'\', '.(int) is_metaconsole().')', ] ); @@ -1742,14 +1747,15 @@ function html_print_select_multiple_modules_filtered(array $data):string $output .= html_print_input( [ - 'label' => __('Modules'), - 'type' => 'select', - 'fields' => $all_modules, - 'name' => 'filtered-module-modules-'.$uniqId, - 'selected' => $result, - 'return' => true, - 'multiple' => true, - 'style' => 'min-width: 200px;max-width:200px;', + 'label' => __('Modules'), + 'label_class' => 'font-title-font', + 'type' => 'select', + 'fields' => $all_modules, + 'name' => 'filtered-module-modules-'.$uniqId, + 'selected' => $result, + 'return' => true, + 'multiple' => true, + 'style' => 'min-width: 200px;max-width:200px;', ] ); diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 42ad5f4e36..e6cdd3f3ab 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -1287,38 +1287,44 @@ function ui_format_alert_row( $additionUrl = ''; } - $forceExecButtons[] = html_print_button( - $forceTitle, - 'force_execution_'.$alert['id'], - false, - 'window.location.assign("'.$url.'&id_alert='.$alert['id'].'&refr=60'.$additionUrl.'");', - [ 'mode' => 'link' ], + $forceExecButtons[] = html_print_anchor( + [ + 'href' => $url.'&id_alert='.$alert['id'].'&refr=60'.$additionUrl, + 'content' => html_print_image( + 'images/force@svg.svg', + true, + [ + 'title' => $forceTitle, + 'class' => 'main_menu_icon invert_filter', + ] + ), + ], true ); } - $forceExecButtons[] = html_print_button( - __('View'), - 'view_template_'.$alert['id'], - false, - '', + $forceExecButtons[] = html_print_anchor( [ - 'mode' => 'link', - 'class' => 'template_details', - 'href' => 'ajax.php?page=godmode/alerts/alert_templates&get_template_tooltip=1&id_template='.$template['id'], + 'href' => 'ajax.php?page=godmode/alerts/alert_templates&get_template_tooltip=1&id_template='.$template['id'], + 'class' => 'template_details', + 'content' => html_print_image( + 'images/details.svg', + true, + ['class' => 'main_menu_icon invert_filter'] + ), ], true ); } else { - $forceExecButtons[] = html_print_button( - __('View'), - 'view_template_'.$alert['id'], - false, - '', + $forceExecButtons[] = html_print_anchor( [ - 'mode' => 'link', - 'class' => 'template_details', - 'href' => ui_get_full_url('/', false, false, false).'/ajax.php?page=enterprise/meta/include/ajax/tree_view.ajax&action=get_template_tooltip&id_template='.$template['id'].'&server_name='.$alert['server_data']['server_name'], + 'href' => ui_get_full_url('/', false, false, false).'/ajax.php?page=enterprise/meta/include/ajax/tree_view.ajax&action=get_template_tooltip&id_template='.$template['id'].'&server_name='.$alert['server_data']['server_name'], + 'class' => 'template_details', + 'content' => html_print_image( + 'images/details.svg', + true, + ['class' => 'main_menu_icon invert_filter'] + ), ], true ); diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 508daaca8a..af33fc2a9a 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -931,6 +931,10 @@ select:-internal-list-box { justify-content: flex-start; } +.flex-align-start { + align-items: start; +} + .flex-baseline { align-self: baseline; } @@ -7404,6 +7408,10 @@ div.graph div.legend table { /* * PADDING RIGHT */ +.pdd_r_0px { + padding-right: 0px !important; +} + .pdd_r_2px { padding-right: 2px; } @@ -7475,6 +7483,10 @@ div.graph div.legend table { /* * PADDING LEFT */ +.pdd_l_0px { + padding-left: 0px !important; +} + .pdd_l_4px { padding-left: 4px; } diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php index f0ae9b033d..4139d30342 100755 --- a/pandora_console/operation/agentes/alerts_status.php +++ b/pandora_console/operation/agentes/alerts_status.php @@ -233,6 +233,7 @@ if ((bool) check_acl($config['id_user'], $id_group, 'LW') === true || (bool) che [ 'title' => __('Operations'), 'text' => __('Operations'), + 'class' => 'left pdd_l_0px pdd_r_0px w100p', ], ); @@ -317,6 +318,7 @@ if (is_metaconsole() === true) { $no_sortable_columns = [ 0, 1, + 2, 5, ]; } else { @@ -514,10 +516,14 @@ function alerts_table_controls() { attribute: 'href', cluetipClass: 'default' }).click (function () { - console.log('click aqui'); return false; }); + $("a.template_details").cluetip ({ + arrows: true, + attribute: 'href', + cluetipClass: 'default' + }); $('[id^=checkbox-all_validate]').change(function(){ if ($("#checkbox-all_validate").prop("checked")) {