Style review

This commit is contained in:
fbsanchez 2019-05-31 09:50:59 +02:00
parent 40cca5e1e3
commit 69054571ab
6 changed files with 68 additions and 37 deletions

View File

@ -245,7 +245,7 @@ if (!$new_agent && $alias != '') {
$table_agent_name .= '</div></div></div>'; $table_agent_name .= '</div></div></div>';
// QR code div. // QR code div.
$table_qr_code = '<div class="agent_qr white_box">'; $table_qr_code = '<div class="box-shadow agent_qr white_box">';
$table_qr_code .= '<p class="input_label">'.__('QR Code Agent view').': </p>'; $table_qr_code .= '<p class="input_label">'.__('QR Code Agent view').': </p>';
$table_qr_code .= '<div id="qr_container_image"></div>'; $table_qr_code .= '<div id="qr_container_image"></div>';
if ($id_agente) { if ($id_agente) {
@ -401,7 +401,7 @@ $table_description .= html_print_textarea(
// QR code. // QR code.
echo '<div class="first_row"> echo '<div class="first_row">
<div class="agent_options '.$agent_options_update.' white_box"> <div class="box-shadow agent_options '.$agent_options_update.' white_box">
<div class="agent_options_column_left">'.$table_agent_name.$table_alias.$table_ip.$table_primary_group.'</div> <div class="agent_options_column_left">'.$table_agent_name.$table_alias.$table_ip.$table_primary_group.'</div>
<div class="agent_options_column_right">'.$table_interval.$table_os.$table_server.$table_description.'</div> <div class="agent_options_column_right">'.$table_interval.$table_os.$table_server.$table_description.'</div>
</div>'; </div>';
@ -777,7 +777,15 @@ $table_adv_options .= $table_adv_gis.'</div>
</div>'; </div>';
echo '<div class="ui_toggle">'; echo '<div class="ui_toggle">';
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 '</div>'; echo '</div>';
@ -895,14 +903,14 @@ foreach ($fields as $field) {
if (!empty($fields)) { if (!empty($fields)) {
echo '<div class="ui_toggle">'; echo '<div class="ui_toggle">';
ui_toggle( ui_toggle(
html_print_table($table, true), html_print_table($table, true),
__('Custom fields'), __('Custom fields'),
'', '',
true, true,
false, false,
'white_box white_box_opened' 'white_box white_box_opened'
); );
echo '</div>'; echo '</div>';
} }

View File

@ -2849,7 +2849,6 @@ function donutNarrowGraph(colores, width, height, total) {
}) })
.attr("d", arc) .attr("d", arc)
.attr("stroke", "white") .attr("stroke", "white")
.style("stroke-width", 2)
.style("fill", function(d) { .style("fill", function(d) {
return color(d.data.key); return color(d.data.key);
}); });

View File

@ -6,7 +6,6 @@ li.discovery {
display: inline-block; display: inline-block;
float: left; float: left;
width: 250px; width: 250px;
height: 120px;
margin: 15px; margin: 15px;
padding-bottom: 50px; padding-bottom: 50px;
} }

View File

@ -16,7 +16,7 @@ div#foot {
background: #343434; background: #343434;
clear: both; clear: both;
width: auto; width: auto;
height: 38px; height: 4em;
margin-top: auto; margin-top: auto;
box-sizing: border-box; box-sizing: border-box;
} }

View File

@ -119,6 +119,7 @@
font-family: verdana, sans-serif; font-family: verdana, sans-serif;
letter-spacing: 0.03pt; letter-spacing: 0.03pt;
font-size: 8pt; font-size: 8pt;
box-sizing: border-box;
} }
svg * { svg * {
font-size: 11pt; font-size: 11pt;
@ -459,6 +460,16 @@ select:-internal-list-box {
max-width: 100%; max-width: 100%;
} }
.padding-2 {
padding: 2em;
}
.padding-4 {
padding: 4em;
}
.padding-6 {
padding: 6em;
}
.no-padding { .no-padding {
padding: 0; padding: 0;
} }
@ -480,6 +491,9 @@ select:-internal-list-box {
.no-td-padding td { .no-td-padding td {
padding: 0; padding: 0;
} }
.td-bg-white td {
background: #fff;
}
div#page { div#page {
background: #fbfbfb; background: #fbfbfb;
@ -1186,9 +1200,12 @@ div#agent_wizard_subtabs {
margin-right: 20px; margin-right: 20px;
} }
#menu_tab_left span {
padding-left: 1em;
}
#menu_tab_left .mn, #menu_tab_left .mn,
#menu_tab_left ul, #menu_tab_left ul {
#menu_tab_left .mn ul {
color: #343434; color: #343434;
padding: 0px 0px 0px 0px; padding: 0px 0px 0px 0px;
list-style: none; list-style: none;
@ -1943,15 +1960,6 @@ div#pandora_logo_header {
font-family: "lato-bolder", "Open Sans", sans-serif; 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 { .header_left {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@ -3146,8 +3154,8 @@ div.div_groups_status {
} }
.databox.pies fieldset.tactical_set { .databox.pies fieldset.tactical_set {
width: 70%; width: 100%;
height: 285px; min-height: 285px;
} }
.difference { .difference {
@ -5045,13 +5053,11 @@ table.info_table > tbody > tr:last-child > td:last-child {
table.info_table > thead > tr > th, table.info_table > thead > tr > th,
table.info_table > tbody > tr > th, table.info_table > tbody > tr > th,
table.info_table > thead > tr > th a { table.info_table > thead > tr > th a {
padding-left: 9px; padding: 0.1em;
padding-right: 9px;
padding-top: 9px;
padding-bottom: 9px;
font-weight: normal; font-weight: normal;
color: #000; color: #000;
font-size: 8.6pt; font-size: 1.2em;
margin-left: 0.5em;
} }
table.info_table > tbody > tr { table.info_table > tbody > tr {
@ -5806,6 +5812,8 @@ div#status_pie {
width: 100%; width: 100%;
height: 100%; height: 100%;
background-color: #fff; background-color: #fff;
box-sizing: border-box;
border: 1px solid #e2e2e2;
display: flex; display: flex;
align-items: center; align-items: center;
flex-wrap: wrap; flex-wrap: wrap;
@ -5815,7 +5823,7 @@ div#status_pie {
border: 1px solid #e2e2e2; border: 1px solid #e2e2e2;
border-top: none; border-top: none;
background-color: #fff; background-color: #fff;
padding: 20px; padding: 5px;
border-bottom-left-radius: 4px; border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;
align-items: center; align-items: center;
@ -5846,6 +5854,12 @@ div#status_pie {
padding: 10px; padding: 10px;
} }
.white-box-content form {
width: 100%;
margin-bottom: 2em;
padding: 2em;
}
/* White tables */ /* White tables */
.white_table, .white_table,
.white_table tr:first-child > th { .white_table tr:first-child > th {

View File

@ -122,7 +122,7 @@ echo '<td style="vertical-align: top; min-width: 180px; width:25%; padding-right
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
$table = new stdClass(); $table = new stdClass();
$table->width = '100%'; $table->width = '100%';
$table->class = 'info_table no-td-borders'; $table->class = 'info_table no-td-borders td-bg-white';
$table->cellpadding = 2; $table->cellpadding = 2;
$table->cellspacing = 2; $table->cellspacing = 2;
$table->border = 0; $table->border = 0;
@ -130,7 +130,6 @@ $table->head = [];
$table->data = []; $table->data = [];
$table->style = []; $table->style = [];
$table->head[0] = '<b><span>'.__('Report of State').'</span></b>';
$stats = reporting_get_stats_indicators($data, 120, 10, false); $stats = reporting_get_stats_indicators($data, 120, 10, false);
$status = '<table class="status_tactical">'; $status = '<table class="status_tactical">';
foreach ($stats as $stat) { foreach ($stats as $stat) {
@ -166,7 +165,12 @@ if ($is_admin) {
$table->rowclass[] = ''; $table->rowclass[] = '';
} }
html_print_table($table); ui_toggle(
html_print_table($table, true),
__('Report of State'),
true,
false
);
echo '</td>'; echo '</td>';
// Left column // Left column
@ -210,7 +214,14 @@ $out = '<table cellpadding=0 cellspacing=0 class="databox pies" style="margin-t
$out .= '<fieldset class="databox tactical_set" id="graphic_event_group"> $out .= '<fieldset class="databox tactical_set" id="graphic_event_group">
<legend>'.__('Event graph by agent').'</legend>'.html_print_image('images/spinner.gif', true, ['id' => 'spinner_graphic_event_group']).'</fieldset>'; <legend>'.__('Event graph by agent').'</legend>'.html_print_image('images/spinner.gif', true, ['id' => 'spinner_graphic_event_group']).'</fieldset>';
$out .= '</td></tr></table>'; $out .= '</td></tr></table>';
echo $out;
ui_toggle(
$out,
__('Event graphs'),
true,
false
);
echo '</td>'; echo '</td>';
echo '</tr></table>'; echo '</tr></table>';