diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php index a31d55a97f..29930bfe72 100644 --- a/pandora_console/godmode/agentes/agent_manager.php +++ b/pandora_console/godmode/agentes/agent_manager.php @@ -581,8 +581,8 @@ $tableAgent->data['description'][0] = html_print_textarea( html_print_div( [ - 'class' => 'box-shadow white_table_flex white_box agent_details_col', - 'style' => 'display: flex; justify-content: space-between; align-items: flex-start;', + 'class' => 'box-flat white_table_flex white_box agent_details_col', + 'style' => 'display: flex; justify-content: space-between; align-items: flex-start; margin-bottom: 20px', 'content' => html_print_table($tableAgent, true).$CodeQRTable, ] ); @@ -908,7 +908,7 @@ foreach ($fields as $field) { 2, 65, $link_text, - 'class="min-height-30px', + 'class="min-height-30px w100p"', true ); $data_field[1] .= '
'; @@ -919,7 +919,7 @@ foreach ($fields as $field) { 2, 65, $link_url, - 'class="min-height-30px', + 'class="min-height-30px w100p"', true ); } else { @@ -928,7 +928,7 @@ foreach ($fields as $field) { 2, 65, $custom_value, - 'class="min-height-30px', + 'class="min-height-30px w100p"', true ); } diff --git a/pandora_console/godmode/agentes/module_manager_editor.php b/pandora_console/godmode/agentes/module_manager_editor.php index 31c2964699..41eb760af3 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-shadow white_table_flex white_table_graph_fixed' + 'box-flat white_table_flex white_table_graph_fixed mrgn_top_20px' ); $outputForm .= ui_toggle( @@ -754,7 +754,7 @@ $outputForm .= ui_toggle( true, '', '', - 'box-shadow white_table_flex white_table_graph_fixed' + 'box-flat white_table_flex white_table_graph_fixed' ); $outputForm .= ui_toggle( @@ -766,7 +766,7 @@ $outputForm .= ui_toggle( true, '', '', - 'box-shadow white_table_flex white_table_graph_fixed' + 'box-flat white_table_flex white_table_graph_fixed' ); if ((int) $moduletype !== 13) { @@ -785,7 +785,7 @@ if ((int) $moduletype !== 13) { true, '', '', - 'box-shadow white_table_flex white_table_graph_fixed' + 'box-flat white_table_flex white_table_graph_fixed' ); } diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php index c04fc5d7a7..c538bea600 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_common.php +++ b/pandora_console/godmode/agentes/module_manager_editor_common.php @@ -223,6 +223,7 @@ if ((isset($id_agent_module) === true && $id_agent_module > 0) || (int) $id_poli $table_simple = new stdClass(); $table_simple->id = 'simple'; +$table_simple->styleTable = 'border-radius: 8px;'; $table_simple->class = 'w100p floating_form'; $table_simple->data = []; $table_simple->style = []; @@ -482,8 +483,9 @@ if ($edit_module === false || (isset($stringTypeModule) === true && $stringTypeM } if ($edit_module === false || (isset($stringTypeModule) === true && $stringTypeModule === true)) { - $tableBasicThresholds->data['caption_switch_warning_inverse_string'][0] = __('Inverse interval'); - $tableBasicThresholds->data['switch_warning_inverse_string'][0] = html_print_checkbox_switch( + $basicThresholdsIntervalWarning = []; + $basicThresholdsIntervalWarning[] = ''.__('Inverse interval').''; + $basicThresholdsIntervalWarning[] = html_print_checkbox_switch( 'warning_inverse_string', 1, $warning_inverse, @@ -491,6 +493,16 @@ if ($edit_module === false || (isset($stringTypeModule) === true && $stringTypeM $disabledBecauseInPolicy ); + $tableBasicThresholds->rowclass['caption_switch_warning_inverse_string'] = 'field_half_width'; + $tableBasicThresholds->data['caption_switch_warning_inverse_string'][0] = html_print_div( + [ + 'class' => 'margin-top-10', + 'style' => 'display: flex; flex-direction: row-reverse; align-items: center;', + 'content' => implode('', $basicThresholdsIntervalWarning), + ], + true + ); + $tableBasicThresholds->data['caption_warning_threshold'][0] .= '('.__('Str.').')'; $tableBasicThresholds->data['warning_threshold'][0] .= html_print_input_text( 'str_warning', @@ -558,8 +570,9 @@ if ($edit_module === false || (isset($stringTypeModule) === true && $stringTypeM } if ($edit_module === false || (isset($stringTypeModule) === true && $stringTypeModule === true)) { - $tableBasicThresholds->data['caption_switch_critical_inverse_string'][0] = __('Inverse interval'); - $tableBasicThresholds->data['switch_critical_inverse_string'][0] = html_print_checkbox_switch( + $basicThresholdsIntervalCritical = []; + $basicThresholdsIntervalCritical[] = ''.__('Inverse interval').''; + $basicThresholdsIntervalCritical[] = html_print_checkbox_switch( 'critical_inverse_string', 1, $critical_inverse, @@ -567,6 +580,16 @@ if ($edit_module === false || (isset($stringTypeModule) === true && $stringTypeM $disabledBecauseInPolicy ); + $tableBasicThresholds->rowclass['caption_switch_critical_inverse_string'] = 'field_half_width'; + $tableBasicThresholds->data['caption_switch_critical_inverse_string'][0] = html_print_div( + [ + 'class' => 'margin-top-10', + 'style' => 'display: flex; flex-direction: row-reverse; align-items: center;', + 'content' => implode('', $basicThresholdsIntervalCritical), + ], + true + ); + $tableBasicThresholds->data['switch_critical_threshold'][0] .= html_print_div( [ 'id' => 'percentage_critical', @@ -710,6 +733,7 @@ $ffThresholdsScript = ob_get_clean(); // Advanced form part. $table_advanced = new stdClass(); $table_advanced->id = 'advanced'; +$table_advanced->styleTable = 'border-radius: 8px'; $table_advanced->width = '100%'; $table_advanced->class = 'w100p floating_form'; $table_advanced->data = []; diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 487528da2c..6430031ce8 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -4212,7 +4212,7 @@ function ui_toggle( $return=false, $toggle_class='', $container_class='white-box-content', - $main_class='box-shadow white_table_graph', + $main_class='box-flat white_table_graph', $img_a='images/arrow_down_green.png', $img_b='images/arrow_right_green.png', $clean=false, @@ -4251,6 +4251,7 @@ function ui_toggle( // Options. $style = 'overflow:hidden;width: -webkit-fill-available;width: -moz-fill-available;'; + $style = 'overflow:hidden;'; if ($hidden_default) { $style .= 'height:0;position:absolute;'; $original = $img_b; @@ -4263,7 +4264,7 @@ function ui_toggle( if ($clean === false) { $header_class = 'white_table_graph_header'; } else { - if ($main_class == 'box-shadow white_table_graph') { + if ($main_class == 'box-flat white_table_graph') { // Default value, clean class. $main_class = ''; } @@ -4439,7 +4440,7 @@ function ui_print_toggle($data) (isset($data['return']) === true) ? $data['return'] : false, (isset($data['toggle_class']) === true) ? $data['toggle_class'] : '', (isset($data['container_class']) === true) ? $data['container_class'] : 'white-box-content', - (isset($data['main_class']) === true) ? $data['main_class'] : 'box-shadow white_table_graph', + (isset($data['main_class']) === true) ? $data['main_class'] : 'box-flat white_table_graph', (isset($data['img_a']) === true) ? $data['img_a'] : 'images/arrow_down_green.png', (isset($data['img_b']) === true) ? $data['img_b'] : 'images/arrow_right_green.png', (isset($data['clean']) === true) ? $data['clean'] : false, diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index e515956a4c..58202c064a 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -1011,6 +1011,10 @@ select:-internal-list-box { border: 1px solid #e2e2e2; } +.box-flat { + border: 1px solid #e5e9ed; + border-radius: 8px; +} .align-top td { vertical-align: top; } @@ -1089,6 +1093,7 @@ div#main { display: flex; /* width: 100%; */ /* margin-left: 3em; */ + background-color: #f6f7fb; margin-bottom: 3em; position: relative; /* margin-top: 8.8em; */ @@ -5748,8 +5753,8 @@ div.label_select_child_left > span { } .white_box_opened { - border-top-left-radius: 0px; - border-top-right-radius: 0px; + border-top-left-radius: 8px; + border-top-right-radius: 8px; } /* @@ -5949,7 +5954,7 @@ div#bullets_modules div { } .agent_details_first_row * { - font-size: 11pt; + font-size: 13px; } /* @@ -5963,7 +5968,7 @@ div#bullets_modules div { .agent_details_col { background-color: #fff; /*border: 1px solid #e2e2e2;*/ - border-radius: 5px; + border-radius: 8px; flex: 1 1 50%; } @@ -6136,6 +6141,7 @@ div#status_pie { /* White tables to show graphs */ .white_table_graph { margin-bottom: 20px; + background-color: #fff; } .white_table_graph_fixed { @@ -6157,8 +6163,8 @@ div#status_pie { background-color: #fff; color: #000; /*border: 1px solid #e2e2e2;*/ - border-top-left-radius: 4px; - border-top-right-radius: 4px; + border-radius: 8px; + /*border-top-right-radius: 8px;*/ font-weight: bold; display: flex; min-width: fit-content; @@ -10708,12 +10714,13 @@ tr.bring_next_field { } .floating_form tr { - min-height: 46px; + /*min-height: 46px;*/ + height: 32px; height: auto; } .floating_form td { - font-size: 11pt; + font-size: 13px; min-height: 32px; font-family: "Pandora-Bold"; } diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php index 23f6ca031d..f23f0e668e 100755 --- a/pandora_console/operation/agentes/alerts_status.php +++ b/pandora_console/operation/agentes/alerts_status.php @@ -519,7 +519,7 @@ if ($agent_view_page === true) { !$alerts_defined, false, true, - 'box-shadow agent_details_col', + 'box-flat agent_details_col', 'white-box-content', 'mrgn_lft_20px mrgn_right_20px width_available' ), diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php index cd03485abf..50e80fd16c 100755 --- a/pandora_console/operation/agentes/estado_generalagente.php +++ b/pandora_console/operation/agentes/estado_generalagente.php @@ -159,8 +159,8 @@ $table_status->width = '100%'; $table_status->cellspacing = 0; $table_status->cellpadding = 0; $table_status->class = 'floating_form'; -$table_status->style[0] = 'height: 46px; width: 30%; padding-right: 5px; text-align: end;'; -$table_status->style[1] = 'height: 46px; width: 70%; padding-left: 5px; font-family: \'Pandora-Regular\';'; +$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; font-family: \'Pandora-Regular\';'; $agentStatusGraph = html_print_div( [ @@ -378,8 +378,8 @@ $table_contact->width = '100%'; $table_contact->cellspacing = 0; $table_contact->cellpadding = 0; $table_contact->class = 'floating_form'; -$table_contact->style[0] = 'height: 46px; width: 30%; padding-right: 5px; text-align: end;'; -$table_contact->style[1] = 'height: 46px; width: 70%; padding-left: 5px; font-family: \'Pandora-Regular\';'; +$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; font-family: \'Pandora-Regular\';'; $agentContactCaption = html_print_div( [ @@ -702,7 +702,7 @@ if ((bool) $config['agentaccess'] === true && $access_agent > 0) { $agentAccessRate = html_print_div( [ - 'class' => 'box-shadow agent_details_col mrgn_right_20px', + 'class' => 'box-flat agent_details_col mrgn_right_20px', 'id' => 'table_access_rate', 'content' => $agentAccessRateHeader.$agentAccessRateContent, ], @@ -988,7 +988,7 @@ $agent_contact .= html_print_table($table_contact, true); $agentDetails = html_print_div( [ - 'class' => 'box-shadow agent_details_col mrgn_lft_20px mrgn_right_20px', + 'class' => 'box-flat agent_details_col mrgn_lft_20px mrgn_right_20px', 'content' => $table_agent, ], true @@ -996,7 +996,7 @@ $agentDetails = html_print_div( $agentContact = html_print_div( [ - 'class' => 'box-shadow agent_details_col mrgn_right_20px', + 'class' => 'box-flat agent_details_col mrgn_right_20px', 'content' => $agent_contact, ], true @@ -1029,7 +1029,7 @@ $agentEventsGraph = html_print_div( $agentEvents = html_print_div( [ - 'class' => 'box-shadow agent_details_col mrgn_lft_20px mrgn_right_20px', + 'class' => 'box-flat agent_details_col mrgn_lft_20px mrgn_right_20px', 'content' => $agentEventsHeader.$agentEventsGraph, ], true @@ -1048,7 +1048,7 @@ if (isset($data_opcional) === false || isset($data_opcional->data) === false || false, false, true, - 'box-shadow agent_details_col agent_details_toggle agent_details_first_row w100p', + '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' ); @@ -1057,8 +1057,8 @@ if (isset($data_opcional) === false || isset($data_opcional->data) === false || $agentIncidents = (isset($table_incident) === false) ? '' : html_print_table($table_incident, true); /* echo '
-
'.$table_agent.'
-
'.$agent_contact.'
+
'.$table_agent.'
+
'.$agent_contact.'
'.$agent_info; */ diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php index 150aaff728..df8d607ee9 100755 --- a/pandora_console/operation/agentes/estado_monitores.php +++ b/pandora_console/operation/agentes/estado_monitores.php @@ -201,7 +201,7 @@ html_print_div( false, false, true, - 'box-shadow agent_details_col', + 'box-flat agent_details_col', 'white-box-content', 'mrgn_lft_20px mrgn_right_20px width_available' ), diff --git a/pandora_console/operation/agentes/status_events.php b/pandora_console/operation/agentes/status_events.php index aad20db779..9932f94709 100755 --- a/pandora_console/operation/agentes/status_events.php +++ b/pandora_console/operation/agentes/status_events.php @@ -32,7 +32,7 @@ html_print_div( 'latest_events_agent', false, true, - 'box-shadow agent_details_col', + 'box-flat agent_details_col', 'white-box-content', 'mrgn_lft_20px mrgn_right_20px width_available' ), diff --git a/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php b/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php index 121fedb342..b6d8c83b82 100644 --- a/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php +++ b/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php @@ -375,9 +375,9 @@ $dates_box .= ''; // Show details, people and dates. echo '
'; - ui_toggle($details_box, __('Details'), '', 'details_box', false, false, '', 'integria_details_content white-box-content', 'integria_details_shadow box-shadow white_table_graph'); - ui_toggle($people_box, __('People'), '', 'people_box', false, false, '', 'integria_details_content white-box-content', 'integria_details_shadow box-shadow white_table_graph'); - ui_toggle($dates_box, __('Dates'), '', 'dates_box', false, false, '', 'integria_details_content white-box-content', 'integria_details_shadow box-shadow white_table_graph'); + ui_toggle($details_box, __('Details'), '', 'details_box', false, false, '', 'integria_details_content white-box-content', 'integria_details_shadow box-flat white_table_graph'); + ui_toggle($people_box, __('People'), '', 'people_box', false, false, '', 'integria_details_content white-box-content', 'integria_details_shadow box-flat white_table_graph'); + ui_toggle($dates_box, __('Dates'), '', 'dates_box', false, false, '', 'integria_details_content white-box-content', 'integria_details_shadow box-flat white_table_graph'); echo '
'; // Show description. diff --git a/pandora_console/operation/tree.php b/pandora_console/operation/tree.php index 79dd86ff06..29d4c95b78 100755 --- a/pandora_console/operation/tree.php +++ b/pandora_console/operation/tree.php @@ -296,7 +296,7 @@ if (is_metaconsole() === true) { false, true, false, - 'box-shadow agent_details_col', + 'box-flat agent_details_col', 'white-box-content', 'mrgn_lft_20px mrgn_right_20px width_available' ); diff --git a/pandora_console/views/cluster/view.php b/pandora_console/views/cluster/view.php index aa0c24fdf4..b27fadc519 100644 --- a/pandora_console/views/cluster/view.php +++ b/pandora_console/views/cluster/view.php @@ -384,7 +384,7 @@ $table_events .= ''; ?>
-
+
@@ -407,7 +407,7 @@ $table_events .= '
';
-
+
printMap(); ?>