diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php index dfdd7390c3..f19d2b0e60 100644 --- a/pandora_console/godmode/agentes/agent_manager.php +++ b/pandora_console/godmode/agentes/agent_manager.php @@ -245,7 +245,7 @@ if (!$new_agent && $alias != '') { $table_agent_name .= ''; // QR code div. - $table_qr_code = '
'; + $table_qr_code = '
'; $table_qr_code .= '

'.__('QR Code Agent view').':

'; $table_qr_code .= '
'; if ($id_agente) { @@ -401,7 +401,7 @@ $table_description .= html_print_textarea( // QR code. echo '
-
+
'.$table_agent_name.$table_alias.$table_ip.$table_primary_group.'
'.$table_interval.$table_os.$table_server.$table_description.'
'; @@ -777,7 +777,15 @@ $table_adv_options .= $table_adv_gis.'
'; echo '
'; - ui_toggle($table_adv_options, __('Advanced options'), '', true, false, 'white_box white_box_opened'); +ui_toggle( + $table_adv_options, + __('Advanced options'), + '', + true, + false, + '', + 'padding-4' +); echo '
'; @@ -895,14 +903,14 @@ foreach ($fields as $field) { if (!empty($fields)) { echo '
'; - ui_toggle( - html_print_table($table, true), - __('Custom fields'), - '', - true, - false, - 'white_box white_box_opened' - ); + ui_toggle( + html_print_table($table, true), + __('Custom fields'), + '', + true, + false, + 'white_box white_box_opened' + ); echo '
'; } diff --git a/pandora_console/include/graphs/pandora.d3.js b/pandora_console/include/graphs/pandora.d3.js index 427de827e3..375c4d328f 100644 --- a/pandora_console/include/graphs/pandora.d3.js +++ b/pandora_console/include/graphs/pandora.d3.js @@ -2849,7 +2849,6 @@ function donutNarrowGraph(colores, width, height, total) { }) .attr("d", arc) .attr("stroke", "white") - .style("stroke-width", 2) .style("fill", function(d) { return color(d.data.key); }); diff --git a/pandora_console/include/styles/discovery.css b/pandora_console/include/styles/discovery.css index e935657d42..7eb14460ce 100644 --- a/pandora_console/include/styles/discovery.css +++ b/pandora_console/include/styles/discovery.css @@ -6,7 +6,6 @@ li.discovery { display: inline-block; float: left; width: 250px; - height: 120px; margin: 15px; padding-bottom: 50px; } diff --git a/pandora_console/include/styles/footer.css b/pandora_console/include/styles/footer.css index 84dff3e551..b215497f35 100644 --- a/pandora_console/include/styles/footer.css +++ b/pandora_console/include/styles/footer.css @@ -16,7 +16,7 @@ div#foot { background: #343434; clear: both; width: auto; - height: 38px; + height: 4em; margin-top: auto; box-sizing: border-box; } diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index d47ab1c9a4..f8cb6dcdd8 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -119,6 +119,7 @@ font-family: verdana, sans-serif; letter-spacing: 0.03pt; font-size: 8pt; + box-sizing: border-box; } svg * { font-size: 11pt; @@ -459,6 +460,16 @@ select:-internal-list-box { max-width: 100%; } +.padding-2 { + padding: 2em; +} +.padding-4 { + padding: 4em; +} +.padding-6 { + padding: 6em; +} + .no-padding { padding: 0; } @@ -480,6 +491,9 @@ select:-internal-list-box { .no-td-padding td { padding: 0; } +.td-bg-white td { + background: #fff; +} div#page { background: #fbfbfb; @@ -1186,9 +1200,12 @@ div#agent_wizard_subtabs { margin-right: 20px; } +#menu_tab_left span { + padding-left: 1em; +} + #menu_tab_left .mn, -#menu_tab_left ul, -#menu_tab_left .mn ul { +#menu_tab_left ul { color: #343434; padding: 0px 0px 0px 0px; list-style: none; @@ -1943,15 +1960,6 @@ div#pandora_logo_header { font-family: "lato-bolder", "Open Sans", sans-serif; } -#header_table_inner a, -#header_table_inner span { - font-family: "Open Sans", sans-serif; -} - -#header_table_inner a:hover { - text-decoration: none; -} - .header_left { display: flex; flex-direction: column; @@ -3146,8 +3154,8 @@ div.div_groups_status { } .databox.pies fieldset.tactical_set { - width: 70%; - height: 285px; + width: 100%; + min-height: 285px; } .difference { @@ -5045,13 +5053,11 @@ table.info_table > tbody > tr:last-child > td:last-child { table.info_table > thead > tr > th, table.info_table > tbody > tr > th, table.info_table > thead > tr > th a { - padding-left: 9px; - padding-right: 9px; - padding-top: 9px; - padding-bottom: 9px; + padding: 0.1em; font-weight: normal; color: #000; - font-size: 8.6pt; + font-size: 1.2em; + margin-left: 0.5em; } table.info_table > tbody > tr { @@ -5806,6 +5812,8 @@ div#status_pie { width: 100%; height: 100%; background-color: #fff; + box-sizing: border-box; + border: 1px solid #e2e2e2; display: flex; align-items: center; flex-wrap: wrap; @@ -5815,7 +5823,7 @@ div#status_pie { border: 1px solid #e2e2e2; border-top: none; background-color: #fff; - padding: 20px; + padding: 5px; border-bottom-left-radius: 4px; border-bottom-right-radius: 4px; align-items: center; @@ -5846,6 +5854,12 @@ div#status_pie { padding: 10px; } +.white-box-content form { + width: 100%; + margin-bottom: 2em; + padding: 2em; +} + /* White tables */ .white_table, .white_table tr:first-child > th { diff --git a/pandora_console/operation/agentes/tactical.php b/pandora_console/operation/agentes/tactical.php index 10e4ff5736..40fc911352 100755 --- a/pandora_console/operation/agentes/tactical.php +++ b/pandora_console/operation/agentes/tactical.php @@ -122,7 +122,7 @@ echo ''; foreach ($stats as $stat) { @@ -166,7 +165,12 @@ if ($is_admin) { $table->rowclass[] = ''; } -html_print_table($table); +ui_toggle( + html_print_table($table, true), + __('Report of State'), + true, + false +); echo ''; // Left column @@ -210,7 +214,14 @@ $out = ''.__('Event graph by agent').''.html_print_image('images/spinner.gif', true, ['id' => 'spinner_graphic_event_group']).''; $out .= '
'; -echo $out; + + +ui_toggle( + $out, + __('Event graphs'), + true, + false +); echo ''; echo '';