From a6f1037c9a76a071dd0d2420fe9c49e73859fd86 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Fri, 24 Feb 2023 13:37:47 +0100 Subject: [PATCH] Minor fixes or improvements --- .../godmode/agentes/module_manager_editor.php | 2 +- .../agentes/module_manager_editor_common.php | 3 +-- pandora_console/include/ajax/events.php | 17 ++++++++++------- pandora_console/include/functions_events.php | 2 +- pandora_console/include/functions_treeview.php | 10 +++++----- pandora_console/include/styles/pandora.css | 16 ++++++++++++++-- .../operation/agentes/alerts_status.php | 2 +- .../operation/agentes/estado_generalagente.php | 16 ++++++++-------- .../operation/agentes/estado_monitores.php | 2 +- .../operation/agentes/status_events.php | 2 +- 10 files changed, 43 insertions(+), 29 deletions(-) diff --git a/pandora_console/godmode/agentes/module_manager_editor.php b/pandora_console/godmode/agentes/module_manager_editor.php index 41eb760af3..66d75c98a7 100644 --- a/pandora_console/godmode/agentes/module_manager_editor.php +++ b/pandora_console/godmode/agentes/module_manager_editor.php @@ -742,7 +742,7 @@ $outputForm .= ui_toggle( true, '', '', - 'box-flat white_table_flex white_table_graph_fixed mrgn_top_20px' + 'box-flat white_table_flex white_table_graph_fixed' ); $outputForm .= ui_toggle( diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php index e3d67c77c4..8f951565c2 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_common.php +++ b/pandora_console/godmode/agentes/module_manager_editor_common.php @@ -865,8 +865,7 @@ $tagsAvailableData .= html_print_image( [ 'id' => 'right', 'title' => __('Add tags to module'), - 'class' => 'invert_filter clickable', - 'style' => 'width: 32px;', + 'class' => 'main_menu_icon invert_filter clickable mrgn_lft_5px', ] ); diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php index e3f15c218c..f7f525feef 100644 --- a/pandora_console/include/ajax/events.php +++ b/pandora_console/include/ajax/events.php @@ -2031,17 +2031,20 @@ if ($table_events) { $tableEvents24h = new stdClass(); $tableEvents24h->class = 'filter_table'; - $tableEvents24h->styleTable = 'border-radius: 0;padding: 0;margin: 0 0 10px;'; + $tableEvents24h->styleTable = 'border: 0;padding: 0;margin: 0 0 10px;'; $tableEvents24h->width = '100%'; $tableEvents24h->data = []; - $tableEvents24h->data[0] = __('Show all Events 24h'); - $tableEvents24h->rowstyle[1] = 'height: 42px'; - $tableEvents24h->data[1] = html_print_switch( + $tableEvents24h->data[0] = html_print_div( [ - 'name' => 'all_events_24h', - 'value' => $all_events_24h, - 'id' => 'checkbox-all_events_24h', + 'class' => 'flex-row-center', + 'content' => ''.__('Show all Events 24h').''.html_print_switch( + [ + 'name' => 'all_events_24h', + 'value' => $all_events_24h, + 'id' => 'checkbox-all_events_24h', + ] + ), ] ); diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index c09d8225ca..8f35a5f202 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -2726,7 +2726,7 @@ function events_print_type_img( [ 'title' => events_print_type_description($type, true), 'class' => $style, - 'style' => 'margin-left: 30px;'.((empty($icon) === false) ? 'background-image: url('.$icon.'); background-repeat: no-repeat;' : ''), + 'style' => 'margin: 0 auto;'.((empty($icon) === false) ? 'background-image: url('.$icon.'); background-repeat: no-repeat;' : ''), ], true ); diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php index b5996fc7d9..3228667e6d 100755 --- a/pandora_console/include/functions_treeview.php +++ b/pandora_console/include/functions_treeview.php @@ -585,7 +585,7 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false) $urlAgent = ''; } } else { - $urlAgent = 'window.location.assign(\'index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$agent['id_agente'].'\')'; + $urlAgent = 'index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$agent['id_agente']; } $cellName = $agent['alias']; @@ -713,7 +713,7 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false) ui_toggle( $eventsGraph, - ''.__('Events (24h)').'', + ''.__('Events (24h)').'', '', '', false, @@ -733,7 +733,7 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false) $access_graph .= ''; ui_toggle( $access_graph, - ''.__('Agent access rate (24h)').'', + ''.__('Agent access rate (24h)').'', '', '', true, @@ -812,7 +812,7 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false) $table_interfaces = html_print_table($table, true); $table_interfaces .= '
'; - ui_toggle($table_interfaces, __('Interface information').' (SNMP)'); + ui_toggle($table_interfaces, ''.__('Interface information').' (SNMP)'); } // Advanced data. @@ -906,7 +906,7 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false) // End of table advanced. ui_toggle( html_print_table($table_advanced, true), - ''.__('Advanced information').'', + ''.__('Advanced information').'', '', '', true, diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 76f249e5a4..4a01b8eac3 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -5948,6 +5948,9 @@ div#bullets_modules div { } /* First row in agent view */ +.agent_details_first_row.agent_details_line { + margin: 0; +} .agent_details_line { display: flex; margin: 20px 0 0; @@ -6149,7 +6152,7 @@ div#status_pie { } .white_table_graph_fixed { - margin: 0 20px 20px; + margin: 0 0 20px; } .white_table_graph_fixed table { @@ -11023,6 +11026,7 @@ table.table_modal_alternate .tags_available_container { display: flex; + align-items: center; } .tags_selected_container .select2-selection--multiple { @@ -11035,7 +11039,8 @@ table.table_modal_alternate .selection span.select2-selection--multiple ul.select2-selection__rendered { - padding: 5px 0 !important; + padding: 5px 0 0 0 !important; + float: left; } .result_info_text { @@ -11092,6 +11097,13 @@ table.table_modal_alternate span.subsection_header_title { height: 18px; } +.subsection_header_title.secondary { + font-size: 14px; +} + +span.subsection_header_title.secondary { + height: 14px; +} .regular_font { font-family: "lato" !important; } diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php index c402e2e820..89ac59d704 100755 --- a/pandora_console/operation/agentes/alerts_status.php +++ b/pandora_console/operation/agentes/alerts_status.php @@ -522,7 +522,7 @@ if ($agent_view_page === true) { true, 'box-flat agent_details_col', 'white-box-content', - 'mrgn_lft_20px mrgn_right_20px width_available' + 'width_available' ), ], ); diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php index ebd9af3506..6461024410 100755 --- a/pandora_console/operation/agentes/estado_generalagente.php +++ b/pandora_console/operation/agentes/estado_generalagente.php @@ -160,7 +160,7 @@ $table_status->cellspacing = 0; $table_status->cellpadding = 0; $table_status->class = 'floating_form'; $table_status->style[0] = 'height: 32px; width: 30%; padding-right: 5px; text-align: end;'; -$table_status->style[1] = 'height: 32px; width: 70%; padding-left: 5px;'; +$table_status->style[1] = 'height: 32px; width: 70%; padding-left: 5px; font-weight: lighter'; $agentStatusGraph = html_print_div( [ @@ -382,7 +382,7 @@ $table_contact->cellspacing = 0; $table_contact->cellpadding = 0; $table_contact->class = 'floating_form'; $table_contact->style[0] = 'height: 32px; width: 30%; padding-right: 5px; text-align: end;'; -$table_contact->style[1] = 'height: 32px; width: 70%; padding-left: 5px;'; +$table_contact->style[1] = 'height: 32px; width: 70%; padding-left: 5px; font-weight: lighter'; $agentContactCaption = html_print_div( [ @@ -705,7 +705,7 @@ if ((bool) $config['agentaccess'] === true && $access_agent > 0) { $agentAccessRate = html_print_div( [ - 'class' => 'box-flat agent_details_col mrgn_right_20px', + 'class' => 'box-flat agent_details_col mrgn_lft_20px', 'id' => 'table_access_rate', 'content' => $agentAccessRateHeader.$agentAccessRateContent, ], @@ -991,7 +991,7 @@ $agent_contact .= html_print_table($table_contact, true); $agentDetails = html_print_div( [ - 'class' => 'box-flat agent_details_col mrgn_lft_20px mrgn_right_20px', + 'class' => 'box-flat agent_details_col', 'content' => $table_agent, ], true @@ -999,7 +999,7 @@ $agentDetails = html_print_div( $agentContact = html_print_div( [ - 'class' => 'box-flat agent_details_col mrgn_right_20px', + 'class' => 'box-flat agent_details_col mrgn_lft_20px', 'content' => $agent_contact, ], true @@ -1032,7 +1032,7 @@ $agentEventsGraph = html_print_div( $agentEvents = html_print_div( [ - 'class' => 'box-flat agent_details_col mrgn_lft_20px mrgn_right_20px', + 'class' => 'box-flat agent_details_col', 'content' => $agentEventsHeader.$agentEventsGraph, ], true @@ -1052,8 +1052,8 @@ if (isset($data_opcional) === false || isset($data_opcional->data) === false || false, true, 'box-flat agent_details_col agent_details_toggle agent_details_first_row w100p', - 'mrgn_lft_20px mrgn_right_20px', - 'mrgn_lft_20px mrgn_right_20px w100p' + 'mrgn_right_20px', + 'w100p' ); } diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php index df8d607ee9..0d04a3b6f0 100755 --- a/pandora_console/operation/agentes/estado_monitores.php +++ b/pandora_console/operation/agentes/estado_monitores.php @@ -203,7 +203,7 @@ html_print_div( true, 'box-flat agent_details_col', 'white-box-content', - 'mrgn_lft_20px mrgn_right_20px width_available' + 'width_available' ), ], ); diff --git a/pandora_console/operation/agentes/status_events.php b/pandora_console/operation/agentes/status_events.php index 9932f94709..d4c63a8b2c 100755 --- a/pandora_console/operation/agentes/status_events.php +++ b/pandora_console/operation/agentes/status_events.php @@ -34,7 +34,7 @@ html_print_div( true, 'box-flat agent_details_col', 'white-box-content', - 'mrgn_lft_20px mrgn_right_20px width_available' + 'width_available' ), ], );