styles review

This commit is contained in:
fbsanchez 2019-06-04 22:16:58 +02:00
parent e1eac631c1
commit a1be1e7332
9 changed files with 140 additions and 75 deletions

View File

@ -176,7 +176,7 @@ if ($disk_conf_delete) {
@unlink($filename['conf']); @unlink($filename['conf']);
} }
echo '<form name="conf_agent" method="post" action="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente">'; echo '<form autocomplete="off" name="conf_agent" method="post" action="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente">';
// Custom ID. // Custom ID.
$custom_id_div = '<div class="label_select">'; $custom_id_div = '<div class="label_select">';
@ -413,8 +413,8 @@ echo '</div>';
if (enterprise_installed()) { if (enterprise_installed()) {
$secondary_groups_selected = enterprise_hook('agents_get_secondary_groups', [$id_agente]); $secondary_groups_selected = enterprise_hook('agents_get_secondary_groups', [$id_agente]);
$table_adv_secondary_groups = '<div class="label_select"><p class="input_label">'.__('Secondary groups').': </p></div>'; $adv_secondary_groups_label = '<div class="label_select"><p class="input_label">'.__('Secondary groups').': </p></div>';
$table_adv_secondary_groups_left = html_print_select_groups( $adv_secondary_groups_left = html_print_select_groups(
false, false,
// Use the current user to select the groups. // Use the current user to select the groups.
'AR', 'AR',
@ -441,7 +441,7 @@ if (enterprise_installed()) {
// CSS classnames (default). // CSS classnames (default).
false, false,
// Not disabled (default). // Not disabled (default).
'width:50%; min-width:170px;', 'min-width:170px;',
// Inline styles (default). // Inline styles (default).
false, false,
// Option style select (default). // Option style select (default).
@ -455,7 +455,7 @@ if (enterprise_installed()) {
// Do not show the primary group in this selection. // Do not show the primary group in this selection.
); );
$table_adv_secondary_groups_arrows = html_print_input_image( $adv_secondary_groups_arrows = html_print_input_image(
'add_secondary', 'add_secondary',
'images/darrowright_green.png', 'images/darrowright_green.png',
1, 1,
@ -479,7 +479,7 @@ if (enterprise_installed()) {
] ]
); );
$table_adv_secondary_groups_right .= html_print_select( $adv_secondary_groups_right .= html_print_select(
$secondary_groups_selected['for_select'], $secondary_groups_selected['for_select'],
// Values. // Values.
'secondary_groups_selected', 'secondary_groups_selected',
@ -502,7 +502,7 @@ if (enterprise_installed()) {
// Class. // Class.
false, false,
// Disabled. // Disabled.
'width:50%; min-width:170px;' 'min-width:170px;'
// Style. // Style.
); );
@ -579,7 +579,7 @@ if (enterprise_installed()) {
} }
$table_adv_parent = '<div class="label_select"><p class="input_label">'.__('Parent').': </p>'; $table_adv_parent = '<div class="label_select"><label class="input_label">'.__('Parent').': </label>';
$params = []; $params = [];
$params['return'] = true; $params['return'] = true;
$params['show_helptip'] = true; $params['show_helptip'] = true;
@ -648,13 +648,15 @@ $table_adv_module_mode .= html_print_radio_button_extended(
$table_adv_module_mode .= '</div></div>'; $table_adv_module_mode .= '</div></div>';
// Status (Disabled / Enabled). // Status (Disabled / Enabled).
$table_adv_status = '<div class="label_select_simple label_simple_one_item"><p class="input_label input_label_simple">'.__('Disabled').': '.ui_print_help_tip(__('If the remote configuration is enabled, it will also go into standby mode when disabling it.'), true).'</p>'; $table_adv_status = '<div class="label_select_simple label_simple_one_item">';
$table_adv_status .= html_print_checkbox_switch( $table_adv_status .= html_print_checkbox_switch(
'disabled', 'disabled',
1, 1,
$disabled, $disabled,
true true
).'</div>'; );
$table_adv_status .= '<p class="input_label input_label_simple">'.__('Disabled').': '.ui_print_help_tip(__('If the remote configuration is enabled, it will also go into standby mode when disabling it.'), true).'</p>';
$table_adv_status .= '</div>';
// Url address. // Url address.
if (enterprise_installed()) { if (enterprise_installed()) {
@ -665,7 +667,14 @@ if (enterprise_installed()) {
'', '',
45, 45,
255, 255,
true true,
false,
false,
'',
'',
'',
// Autocomplete.
'off'
).'</div>'; ).'</div>';
} else { } else {
$table_adv_url = '<div class="label_select"><p class="input_label">'.__('Url address').': </p></div>'; $table_adv_url = '<div class="label_select"><p class="input_label">'.__('Url address').': </p></div>';
@ -679,9 +688,11 @@ if (enterprise_installed()) {
).'</div>'; ).'</div>';
} }
$table_adv_quiet = '<div class="label_select_simple label_simple_one_item"><p class="input_label input_label_simple">'.__('Quiet').': '; $table_adv_quiet = '<div class="label_select_simple label_simple_one_item">';
$table_adv_quiet .= html_print_checkbox_switch('quiet', 1, $quiet, true);
$table_adv_quiet .= '<p class="input_label input_label_simple">'.__('Quiet').': ';
$table_adv_quiet .= ui_print_help_tip(__('The agent still runs but the alerts and events will be stop'), true).'</p>'; $table_adv_quiet .= ui_print_help_tip(__('The agent still runs but the alerts and events will be stop'), true).'</p>';
$table_adv_quiet .= html_print_checkbox_switch('quiet', 1, $quiet, true).'</div>'; $table_adv_quiet .= '</div>';
$listIcons = gis_get_array_list_icons(); $listIcons = gis_get_array_list_icons();
@ -753,28 +764,34 @@ if ($config['activate_gis']) {
// General display distribution. // General display distribution.
$table_adv_options = $table_adv_secondary_groups.'<div class="secondary_groups_select" style="margin-bottom:30px;"> $table_adv_options = '
<div class="secondary_groups_list_left"> <div class="secondary_groups_list">
'.$table_adv_secondary_groups_left.' '.$adv_secondary_groups_label.'
<div class="sg_source">
'.$adv_secondary_groups_left.'
</div>
<div class="secondary_group_arrows">
'.$adv_secondary_groups_arrows.'
</div>
<div class="sg_target">
'.$adv_secondary_groups_right.'
</div>
</div> </div>
<div class="secondary_groups_select_arrows"> <div class="adv_right" >
'.$table_adv_secondary_groups_arrows.' '.$table_adv_parent.$table_adv_module_mode.$table_adv_cascade;
</div>
<div class="secondary_groups_list_right">
'.$table_adv_secondary_groups_right.'
</div>
</div>
<div class="agent_options agent_options_adv">
<div class="agent_options_column_left" >'.$table_adv_parent.$table_adv_module_mode.$table_adv_cascade;
if ($new_agent) { if ($new_agent) {
// If agent is new, show custom id as old style format. // If agent is new, show custom id as old style format.
$table_adv_options .= $custom_id_div; $table_adv_options .= $custom_id_div;
} }
$table_adv_options .= $table_adv_gis.'</div> $table_adv_options .= '</div>';
<div class="agent_options_column_right" >'.$table_adv_agent_icon.$table_adv_url.$table_adv_quiet.$table_adv_status.$table_adv_remote.$table_adv_safe.'</div>
</div>'; $table_adv_options .= '
<div class="adv_left" >
'.$table_adv_gis.$table_adv_agent_icon.$table_adv_url.$table_adv_quiet.$table_adv_status.$table_adv_remote.$table_adv_safe.'
</div>';
echo '<div class="ui_toggle">'; echo '<div class="ui_toggle">';
ui_toggle( ui_toggle(
@ -782,9 +799,10 @@ ui_toggle(
__('Advanced options'), __('Advanced options'),
'', '',
'', '',
true,
false, false,
'', 'white_box white_box_opened',
'padding-4' 'no-border flex'
); );
echo '</div>'; echo '</div>';
@ -908,6 +926,7 @@ if (!empty($fields)) {
__('Custom fields'), __('Custom fields'),
'', '',
'', '',
true,
false, false,
'white_box white_box_opened', 'white_box white_box_opened',
'no-border' 'no-border'

View File

@ -718,7 +718,7 @@ if ($table_events) {
'AND' 'AND'
); );
echo '<div style="display: flex;" id="div_all_events_24h">'; echo '<div style="display: flex;" id="div_all_events_24h">';
echo '<label style="margin-right: 1em;"><b>'.__('Show all Events 24h').'</b></label>'; echo '<label style="margin: 0 1em 0 2em;"><b>'.__('Show all Events 24h').'</b></label>';
echo html_print_switch( echo html_print_switch(
[ [
'name' => 'all_events_24h', 'name' => 'all_events_24h',

View File

@ -1034,7 +1034,7 @@ function events_print_event_table(
} }
$table->head[$i] = __('Timestamp'); $table->head[$i] = __('Timestamp');
$table->headstyle[$i] = 'width: 120px;'; $table->headstyle[$i] = 'width: 150px;';
$table->style[$i++] = 'word-break: break-word;'; $table->style[$i++] = 'word-break: break-word;';
$table->head[$i] = __('Status'); $table->head[$i] = __('Status');

View File

@ -16,6 +16,7 @@
.agent_options_update { .agent_options_update {
width: 85%; width: 85%;
margin-right: 20px; margin-right: 20px;
min-width: 640px;
} }
.agent_options_column_left, .agent_options_column_left,
@ -43,6 +44,20 @@ a#qr_code_agent_view {
margin-top: 5px; margin-top: 5px;
} }
.p-switch {
margin-right: 1em;
}
.sg_source,
.sg_target {
width: 35%;
}
.sg_source select,
.sg_target select {
width: 100%;
}
.first_row .agent_options_column_right select, .first_row .agent_options_column_right select,
.first_row .agent_options_column_right input, .first_row .agent_options_column_right input,
.first_row .agent_options_column_left select#grupo { .first_row .agent_options_column_left select#grupo {
@ -104,34 +119,40 @@ a#qr_code_agent_view {
border-bottom-right-radius: 0px; border-bottom-right-radius: 0px;
} }
.secondary_groups_select { .adv_right,
.adv_left,
.secondary_groups_list {
flex: 1;
}
.secondary_groups_list {
display: flex; display: flex;
flex-direction: row;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
margin-bottom: 15px; flex-wrap: wrap;
min-width: 640px;
}
.secondary_group_arrows {
display: flex;
flex-direction: column;
padding: 0 2em;
} }
.secondary_groups_select .secondary_groups_select_arrows input { .no-border.flex {
display: grid; display: flex;
margin: 0 auto; flex-direction: row;
flex-wrap: wrap;
justify-content: start;
align-items: start;
} }
.secondary_groups_select .secondary_groups_list_left { .no-border.flex > div {
text-align: right; margin: 1em;
width: 50%;
} }
.secondary_groups_select .secondary_groups_list_right { .adv_left input,
text-align: left; .adv_left select {
width: 50%; width: 100%;
}
.secondary_groups_select .secondary_groups_select_arrows {
padding: 0 50px;
}
.secondary_groups_select_arrows a {
display: block;
} }
.agent_options_adv .agent_options_column_right .label_select select, .agent_options_adv .agent_options_column_right .label_select select,
@ -156,3 +177,7 @@ a#qr_code_agent_view {
border-radius: 5px; border-radius: 5px;
border: 1px solid #ccc; border: 1px solid #ccc;
} }
#safe_mode_module {
margin-top: 0.6em;
}

View File

@ -1,5 +1,5 @@
div.fixed-bottom-box { div.fixed-bottom-box {
background: #e1e1e1; background: #fff;
border-radius: 10px 10px 0 0; border-radius: 10px 10px 0 0;
-moz-border-radius: 10px 10px 0 0; -moz-border-radius: 10px 10px 0 0;
@ -9,6 +9,20 @@ div.fixed-bottom-box {
-khtml-border-radius: 10px 10px 0 0; -khtml-border-radius: 10px 10px 0 0;
} }
/* Overrides */
.left_align {
border: 1px solid #e1e1e1;
}
.white_table_graph_header {
border-top-left-radius: 0px;
border-top-right-radius: 0px;
margin: -1px;
}
.white-box-content {
margin: -1px;
}
/* Overrides end */
div.fixed-bottom-box > div.fixed-bottom-box-head { div.fixed-bottom-box > div.fixed-bottom-box-head {
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;

View File

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

View File

@ -13,15 +13,16 @@
background-color: #82b92e; background-color: #82b92e;
border-radius: 0; border-radius: 0;
margin: 0; margin: 0;
padding: 0; display: inherit;
text-align: center;
padding: 0.4em 0em;
height: 30px;
position: relative;
} }
/*center ui dialog center*/ /*center ui dialog center*/
.ui-dialog-titlebar .ui-icon-closethick {
margin-top: -5px;
}
.ui-button-text-only .ui-button-text { .ui-button-text-only .ui-button-text {
font-family: nunito; font-family: "lato", "Open Sans", sans-serif;
font-size: 9pt; font-size: 9pt;
color: #82b92e; color: #82b92e;
} }
@ -33,23 +34,14 @@
.ui-datepicker .ui-datepicker-title option { .ui-datepicker .ui-datepicker-title option {
color: #111; color: #111;
} }
.ui-dialog .ui-dialog-titlebar {
display: inherit;
text-align: center;
padding: 0.4em 1em;
height: 30px;
position: relative;
}
.ui-dialog .ui-dialog-title { .ui-dialog .ui-dialog-title {
font-family: Nunito, sans-serif; font-family: "lato-bolder", "Open Sans", sans-serif;
margin: 0.1em 0;
white-space: nowrap; white-space: nowrap;
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
font-size: 11pt;
position: relative; position: relative;
float: none; font-size: 12pt;
} }
.ui-dialog .ui-dialog-titlebar-close { .ui-dialog .ui-dialog-titlebar-close {
position: absolute; position: absolute;
@ -147,6 +139,7 @@
} }
.ui-dialog .ui-widget-header { .ui-dialog .ui-widget-header {
background-color: #82b92e; background-color: #82b92e;
margin: -1px;
} }
.ui_tpicker_hour, .ui_tpicker_hour,
.ui_tpicker_minute, .ui_tpicker_minute,
@ -185,6 +178,12 @@
border: 0px; border: 0px;
} }
.ui-dialog-titlebar .ui-icon-closethick { .ui-dialog-titlebar .ui-icon-closethick {
margin-top: -5px;
background-image: url("../../../images/icono_cerrar.png");
top: 20%;
left: 70%;
}
.ui-dialog-titlebar.ui-icon-closethick:hover {
background-image: url("../../../images/icono_cerrar.png"); background-image: url("../../../images/icono_cerrar.png");
} }
.ui-dialog-title { .ui-dialog-title {
@ -195,7 +194,7 @@
.ui-widget select, .ui-widget select,
.ui-widget textarea, .ui-widget textarea,
.ui-widget button { .ui-widget button {
font-family: Verdana, Arial, sans-serif; font-family: "lato", "Open Sans", sans-serif;
} }
a.ui-button:active, a.ui-button:active,

View File

@ -58,7 +58,7 @@ li:hover ul {
margin-left: 0px; margin-left: 0px;
width: 100%; width: 100%;
color: #b9b9b9; color: #b9b9b9;
font-family: "Open Sans", sans-serif; font-family: "lato", "Open Sans", sans-serif;
font-size: 9.4pt; font-size: 9.4pt;
} }
@ -381,7 +381,6 @@ ul li {
top: 0; top: 0;
left: 0; left: 0;
background-color: #343434; background-color: #343434;
border-bottom: solid 3px #343434;
} }
.button_collapse { .button_collapse {
@ -406,7 +405,7 @@ ul li {
.operation a, .operation a,
.godmode div, .godmode div,
.godmode a { .godmode a {
font-family: "Open Sans", sans-serif; font-family: "lato", "Open Sans", sans-serif;
} }
.menu_full_classic, .menu_full_classic,

View File

@ -2770,7 +2770,7 @@ input.search_input {
background-color: #f2f6f7; background-color: #f2f6f7;
padding: 0px; padding: 0px;
margin: 0; margin: 0;
width: 250px; width: 300px;
height: 30px; height: 30px;
margin-left: 2px; margin-left: 2px;
padding-left: 15px; padding-left: 15px;
@ -5621,6 +5621,13 @@ div#status_pie {
border-top-left-radius: 4px; border-top-left-radius: 4px;
border-top-right-radius: 4px; border-top-right-radius: 4px;
font-weight: bold; font-weight: bold;
display: flex;
min-width: fit-content;
}
.white_table_graph_header b {
font-size: 10pt;
font-weight: 600;
} }
.white_table_graph_header div#bullets_modules { .white_table_graph_header div#bullets_modules {
@ -5649,7 +5656,8 @@ div#status_pie {
display: flex; display: flex;
align-items: center; align-items: center;
flex-wrap: wrap; flex-wrap: wrap;
padding: 0 1em 0; padding: 1em;
min-width: fit-content;
} }
.white_table_graph_content { .white_table_graph_content {
@ -5691,6 +5699,7 @@ div#status_pie {
width: 100%; width: 100%;
margin-bottom: 2em; margin-bottom: 2em;
padding: 2em; padding: 2em;
min-width: fit-content;
} }
/* White tables */ /* White tables */