style review

This commit is contained in:
fbsanchez 2019-06-03 19:13:29 +02:00
parent 31257c02a4
commit 974db824a8
14 changed files with 78 additions and 21 deletions

View File

@ -583,7 +583,12 @@ echo '<h3 id="message" class="error invisible"></h3>';
// TODO: Change to the ui_print_error system // TODO: Change to the ui_print_error system
echo '<form method="post" id="module_form">'; echo '<form method="post" id="module_form">';
html_print_table($table_simple); ui_toggle(
html_print_table($table_simple, true),
__('Base options'),
true,
false
);
ui_toggle( ui_toggle(
html_print_table($table_advanced, true), html_print_table($table_advanced, true),

View File

@ -162,7 +162,7 @@ $edit_module = (bool) get_parameter_get('edit_module');
$table_simple = new stdClass(); $table_simple = new stdClass();
$table_simple->id = 'simple'; $table_simple->id = 'simple';
$table_simple->width = '100%'; $table_simple->width = '100%';
$table_simple->class = 'databox'; $table_simple->class = 'no-class';
$table_simple->data = []; $table_simple->data = [];
$table_simple->style = []; $table_simple->style = [];
$table_simple->style[0] = 'font-weight: bold; width: 25%;'; $table_simple->style[0] = 'font-weight: bold; width: 25%;';
@ -637,7 +637,7 @@ if ($disabledBecauseInPolicy) {
$table_advanced = new stdClass(); $table_advanced = new stdClass();
$table_advanced->id = 'advanced'; $table_advanced->id = 'advanced';
$table_advanced->width = '100%'; $table_advanced->width = '100%';
$table_advanced->class = 'databox filters'; $table_advanced->class = 'no-class';
$table_advanced->data = []; $table_advanced->data = [];
$table_advanced->style = []; $table_advanced->style = [];
$table_advanced->style[0] = $table_advanced->style[3] = $table_advanced->style[5] = 'font-weight: bold;'; $table_advanced->style[0] = $table_advanced->style[3] = $table_advanced->style[5] = 'font-weight: bold;';
@ -1066,7 +1066,7 @@ if (check_acl($config['id_user'], 0, 'PM')) {
$table_macros = new stdClass(); $table_macros = new stdClass();
$table_macros->id = 'module_macros'; $table_macros->id = 'module_macros';
$table_macros->width = '100%'; $table_macros->width = '100%';
$table_macros->class = 'databox filters'; $table_macros->class = 'no-class';
$table_macros->data = []; $table_macros->data = [];
$table_macros->style = []; $table_macros->style = [];
$table_macros->style[0] = 'font-weight: bold;'; $table_macros->style[0] = 'font-weight: bold;';
@ -1107,7 +1107,7 @@ html_print_input_hidden('module_macro_count', $macro_count);
$table_new_relations = new stdClass(); $table_new_relations = new stdClass();
$table_new_relations->id = 'module_new_relations'; $table_new_relations->id = 'module_new_relations';
$table_new_relations->width = '100%'; $table_new_relations->width = '100%';
$table_new_relations->class = 'databox filters'; $table_new_relations->class = 'no-class';
$table_new_relations->data = []; $table_new_relations->data = [];
$table_new_relations->style = []; $table_new_relations->style = [];
$table_new_relations->style[0] = 'width: 10%; font-weight: bold;'; $table_new_relations->style[0] = 'width: 10%; font-weight: bold;';

View File

@ -825,7 +825,7 @@ if (check_login()) {
$table->head[8] = __('Graph'); $table->head[8] = __('Graph');
$table->head[9] = __('Last contact').ui_get_sorting_arrows($url_up_last, $url_down_last, $selectLastContactUp, $selectLastContactDown); $table->head[9] = __('Last contact').ui_get_sorting_arrows($url_up_last, $url_down_last, $selectLastContactUp, $selectLastContactDown);
$table->align = []; $table->align = [];
$table->align[0] = 'left'; $table->align[0] = 'center';
$table->align[1] = 'left'; $table->align[1] = 'left';
$table->align[2] = 'left'; $table->align[2] = 'left';
$table->align[3] = 'left'; $table->align[3] = 'left';

View File

@ -151,6 +151,10 @@ if (is_ajax()) {
ob_clean(); ob_clean();
echo '<style type="text/css">';
include_once __DIR__.'/../styles/progress.css';
echo '</style>';
echo '<div class="left_align">'; echo '<div class="left_align">';
if (!empty($id) && !empty($type)) { if (!empty($id) && !empty($type)) {
switch ($type) { switch ($type) {

View File

@ -2932,7 +2932,10 @@ function html_print_sort_arrows($params, $order_tag, $up='up', $down='down')
$url_down = 'index.php?'.http_build_query($params, '', '&amp;'); $url_down = 'index.php?'.http_build_query($params, '', '&amp;');
// Build the links // Build the links
return '&nbsp;'.'<a href="'.$url_up.'">'.html_print_image('images/sort_up.png', true).'</a>'.'<a href="'.$url_down.'">'.html_print_image('images/sort_down.png', true).'</a>'; $out = '&nbsp;<a href="'.$url_up.'">';
$out .= html_print_image('images/sort_up_black.png', true);
$out .= '</a><a href="'.$url_down.'">';
$out .= html_print_image('images/sort_down_black.png', true).'</a>';
} }

View File

@ -637,7 +637,13 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
$row = []; $row = [];
$row['title'] = __('Next agent contact'); $row['title'] = __('Next agent contact');
$row['data'] = progress_bar($progress, 150, 20); $row['data'] = ui_progress(
$progress,
'100%',
'1.5',
'#80ba27',
true
);
$table->data['next_contact'] = $row; $table->data['next_contact'] = $row;
// End of table // End of table

View File

@ -2872,8 +2872,6 @@ function donutNarrowGraph(colores, width, height, total) {
.attr("y", 0 + radius / 10) .attr("y", 0 + radius / 10)
.attr("class", "text-tooltip") .attr("class", "text-tooltip")
.style("text-anchor", "middle") .style("text-anchor", "middle")
.attr("font-weight", "bold")
.style("font-family", "Arial, Verdana")
//.attr("fill", "#82b92e") //.attr("fill", "#82b92e")
.style("font-size", function(d) { .style("font-size", function(d) {
if (normal_status) { if (normal_status) {

View File

@ -1,5 +1,6 @@
text.text-tooltip { text.text-tooltip {
font-family: "lato-bolder", "Open Sans", sans-serif; font-family: "lato-bolder", "Open Sans", sans-serif;
font-weight: bold;
} }
div#bullets_modules span { div#bullets_modules span {
@ -17,3 +18,12 @@ div.agent_details_agent_alias {
div.agent_details_agent_alias * { div.agent_details_agent_alias * {
font-family: "lato-bolder", "Open Sans", sans-serif; font-family: "lato-bolder", "Open Sans", sans-serif;
} }
#module_filter_agent_view tr td {
padding-bottom: 3em;
}
#div_all_events_24h {
border-bottom: 1px solid #ebebeb;
padding-bottom: 3em;
}

View File

@ -116,7 +116,7 @@
src: url("../../fonts/Lato-Regular.ttf"); src: url("../../fonts/Lato-Regular.ttf");
} }
* { * {
font-family: verdana, sans-serif; font-family: "lato-lighter", "Open Sans", sans-serif;
letter-spacing: 0.03pt; letter-spacing: 0.03pt;
font-size: 8pt; font-size: 8pt;
box-sizing: border-box; box-sizing: border-box;
@ -460,6 +460,34 @@ select:-internal-list-box {
width: 100%; width: 100%;
} }
.h10p {
height: 10%;
}
.h20p {
height: 20%;
}
.h30p {
height: 30%;
}
.h40p {
height: 40%;
}
.h50p {
height: 50%;
}
.h80p {
height: 80%;
}
.h100p {
height: 100%;
}
.padding-2 { .padding-2 {
padding: 2em; padding: 2em;
} }

View File

@ -73,8 +73,8 @@
border-top-right-radius: 4px; border-top-right-radius: 4px;
} }
.info_table > thead > tr > th,
.info_table > tbody > tr > th, .info_table > tbody > tr > th,
.info_table > thead > tr > th,
.info_table > thead > tr > th a, .info_table > thead > tr > th a,
.info_table > thead > tr > th > span { .info_table > thead > tr > th > span {
padding: 0.1em; padding: 0.1em;
@ -142,6 +142,7 @@
.info_table .datos4 * { .info_table .datos4 * {
font-size: 8.6pt; font-size: 8.6pt;
font-weight: normal; font-weight: normal;
padding: 1.3em 0;
} }
/*td.datos_id { /*td.datos_id {

View File

@ -4,7 +4,7 @@
} }
.tree-group { .tree-group {
margin-left: 16px; margin-left: 19px;
padding-top: 1px; padding-top: 1px;
} }
@ -22,7 +22,8 @@
background: 0 0; background: 0 0;
} }
.node-content { .node-content {
height: 16px; height: 26px;
font-size: 1.2em;
} }
.node-content > img { .node-content > img {
@ -128,7 +129,7 @@
.tree-node > .node-content > .tree-node-counters > .tree-node-counter { .tree-node > .node-content > .tree-node-counters > .tree-node-counter {
font-weight: bold; font-weight: bold;
font-size: 7pt; font-size: 1.2em;
cursor: default; cursor: default;
} }

View File

@ -505,12 +505,12 @@ $access_agent = db_get_value_sql(
); );
if ($config['agentaccess'] && $access_agent > 0) { if ($config['agentaccess'] && $access_agent > 0) {
$table_access_rate = '<div class="box-shadow white_table_graph" id="table_access_rate"> $table_access_rate = '<div class="white_table_graph" id="table_access_rate">
<div class="white_table_graph_header">'.html_print_image( <div class="white_table_graph_header">'.html_print_image(
'images/arrow_down_green.png', 'images/arrow_down_green.png',
true true
).'<span>'.__('Agent access rate (24h)').'</span></div> ).'<span>'.__('Agent access rate (24h)').'</span></div>
<div class="white_table_graph_content min-height-100"> <div class="white_table_graph_content h80p">
'.graphic_agentaccess( '.graphic_agentaccess(
$id_agente, $id_agente,
'95%', '95%',
@ -820,12 +820,12 @@ if (!empty($network_interfaces)) {
<?php <?php
// EVENTS. // EVENTS.
if ($config['agentaccess'] && $access_agent > 0) { if ($config['agentaccess'] && $access_agent > 0) {
$extra_class = 'min-height-100'; $extra_class = 'h80p';
} else { } else {
$extra_class = ''; $extra_class = '';
} }
$table_events = '<div class="box-shadow white_table_graph" id="table_events"> $table_events = '<div class="white_table_graph" id="table_events">
<div class="white_table_graph_header">'.html_print_image( <div class="white_table_graph_header">'.html_print_image(
'images/arrow_down_green.png', 'images/arrow_down_green.png',
true true

View File

@ -496,7 +496,8 @@ function print_form_filter_monitors(
$form_text = ''; $form_text = '';
$table = new stdClass(); $table = new stdClass();
$table->class = 'info_table'; $table->class = 'info_table';
$table->styleTable = 'border: 1px solid #ebebeb;border-radius: 0;padding: 0;margin: 0;margin-top: -1px;'; $table->id = 'module_filter_agent_view';
$table->styleTable = 'border-radius: 0;padding: 0;margin: 0;';
$table->width = '100%'; $table->width = '100%';
$table->style[0] = 'font-weight: bold;'; $table->style[0] = 'font-weight: bold;';
$table->style[2] = 'font-weight: bold;'; $table->style[2] = 'font-weight: bold;';

View File

@ -29,7 +29,7 @@ $table->id = 'eventtable';
$table->cellpadding = 4; $table->cellpadding = 4;
$table->cellspacing = 4; $table->cellspacing = 4;
if (!isset($table->class)) { if (!isset($table->class)) {
$table->class = 'databox data'; $table->class = 'info_table';
} }
$table->head = []; $table->head = [];