tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-27 15:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Styling review

Browse Source
This commit is contained in:
fbsanchez 2019-05-29 15:14:13 +02:00
parent 8bd4a2f8f7
commit f58d1bc6ee
5 changed files with 68 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
pandora_console/include/functions_events.php
View File

@ -999,7 +999,7 @@ function events_print_event_table(
$table->cellpadding = 0; $table->cellpadding = 0;
$table->cellspacing = 0; $table->cellspacing = 0;
$table->width = $width; $table->width = $width;
$table->class = 'info_table'; $table->class = 'info_table no-td-padding';
if (!$tactical_view) { if (!$tactical_view) {
$table->title = __('Latest events'); $table->title = __('Latest events');
} }
@ -1012,41 +1012,38 @@ function events_print_event_table(
$table->cellclass = []; $table->cellclass = [];
$table->data = []; $table->data = [];
$table->align = []; $table->align = [];
$table->style[0] = 'width:25px;'; $table->style = [];
$table->style[1] = 'width:25px;padding: 0;';
$table->style[2] = 'width:25px;';
if ($agent_id == 0) {
$table->style[3] = 'word-break: break-all;';
}
$table->style[4] = 'width:120px; word-break: break-all;'; $i = 0;
$table->head[$i] = "<span title='".__('Severity')."'>".__('S.').'</span>';
$table->headstyle[$i] = 'width: 1%;text-align: center;';
$table->style[$i++] = 'text-align: center;';
$table->head[0] = "<span title='".__('Validated')."'>".__('V.').'</span>'; $table->head[$i] = __('Type');
$table->align[0] = 'center'; $table->headstyle[$i] = 'width: 3%;text-align: center;';
$table->style[$i++] = 'text-align: center;';
$table->head[1] = "<span title='".__('Severity')."'>".__('S.').'</span>'; $table->head[$i] = __('Event name');
$table->align[1] = 'center'; $table->headstyle[$i] = '';
$table->style[$i++] = 'word-break: break-word;';
$table->head[2] = __('Type');
$table->headclass[2] = 'datos3 f9';
$table->align[2] = 'center';
$table->head[3] = __('Event name');
if ($agent_id == 0) { if ($agent_id == 0) {
$table->head[4] = __('Agent name'); $table->head[$i] = __('Agent name');
$table->size[4] = '15%'; $table->headstyle[$i] = '';
$table->style[$i++] = 'word-break: break-all;';
} }
$table->head[5] = __('Timestamp'); $table->head[$i] = __('Timestamp');
$table->headclass[5] = 'datos3 f9'; $table->headstyle[$i] = 'width: 120px;';
$table->align[5] = 'left'; $table->style[$i++] = 'word-break: break-word;';
$table->size[5] = '15%';
$table->head[6] = __('Status'); $table->head[$i] = __('Status');
$table->headclass[6] = 'datos3 f9'; $table->headstyle[$i] = 'width: 150px;text-align: center;';
$table->align[6] = 'left'; $table->style[$i++] = 'text-align: center;';
$table->size[6] = '13%';
$table->head[$i] = "<span title='".__('Validated')."'>".__('V.').'</span>';
$table->headstyle[$i] = 'width: 1%;text-align: center;';
$table->style[$i++] = 'text-align: center;';
$all_groups = []; $all_groups = [];
if ($agent_id != 0) { if ($agent_id != 0) {
@ -1085,44 +1082,15 @@ function events_print_event_table(
break; break;
} }
$data[0] = html_print_image( $i = 0;
$img, // Criticity.
true, $data[$i++] = ui_print_event_priority($event['criticity'], true, true);
[
'class' => 'image_status',
'title' => $title,
]
);
switch ($event['criticity']) {
default:
case EVENT_CRIT_MAINTENANCE:
$img = 'images/status_sets/default/severity_maintenance.png';
break;
case EVENT_CRIT_INFORMATIONAL:
$img = 'images/status_sets/default/severity_informational.png';
break;
case EVENT_CRIT_NORMAL:
$img = 'images/status_sets/default/severity_normal.png';
break;
case EVENT_CRIT_WARNING:
$img = 'images/status_sets/default/severity_warning.png';
break;
case EVENT_CRIT_CRITICAL:
$img = 'images/status_sets/default/severity_critical.png';
break;
}
$data[1] = ui_print_event_priority($event['criticity'], true, true);
// Event type. // Event type.
$data[2] = events_print_type_img($event['event_type'], true); $data[$i++] = events_print_type_img($event['event_type'], true);
// Event text. // Event text.
$data[3] = ui_print_string_substr( $data[$i++] = ui_print_string_substr(
strip_tags(io_safe_output($event['evento'])), strip_tags(io_safe_output($event['evento'])),
75, 75,
true, true,
@ -1133,36 +1101,32 @@ function events_print_event_table(
if ($event['id_agente'] > 0) { if ($event['id_agente'] > 0) {
// Agent name. // Agent name.
// Get class name, for the link color, etc. // Get class name, for the link color, etc.
$data[4] = "<a href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=".$event['id_agente']."'>".agents_get_alias($event['id_agente']).'</A>'; $data[$i] = "<a href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=".$event['id_agente']."'>".agents_get_alias($event['id_agente']).'</A>';
// For System or SNMP generated alerts. // For System or SNMP generated alerts.
} else if ($event['event_type'] == 'system') { } else if ($event['event_type'] == 'system') {
$data[4] = __('System'); $data[$i] = __('System');
} else { } else {
$data[4] = __('Alert').'SNMP'; $data[$i] = __('Alert').'SNMP';
} }
$i++;
} }
// Timestamp. // Timestamp.
$data[5] = ui_print_timestamp($event['timestamp'], true, ['style' => 'font-size: 7.5pt; letter-spacing: 0.3pt;']); $data[$i++] = ui_print_timestamp($event['timestamp'], true, ['style' => 'font-size: 7.5pt; letter-spacing: 0.3pt;']);
// Status. // Status.
$data[6] = ui_print_event_type($event['event_type'], true); $data[$i++] = ui_print_event_type($event['event_type'], true);
/* $data[$i++] = html_print_image(
$class = get_priority_class($event['criticity']); $img,
$cell_classes[3] = $class; true,
$cell_classes[4] = $class; [
$cell_classes[5] = $class; 'class' => 'image_status',
'title' => $title,
array_push($table->cellclass, $cell_classes); ]
*/ );
$table->data[] = $data;
/*
Commented out (old).
// array_push ($table->rowclass, get_priority_class ($event["criticity"]));
*/
array_push($table->data, $data);
} }
$events_table = html_print_table($table, true); $events_table = html_print_table($table, true);

4
pandora_console/include/styles/events.css
View File

@ -4,8 +4,8 @@ div.criticity {
color: #fff; color: #fff;
text-align: center; text-align: center;
border-radius: 5px; border-radius: 5px;
font-size: 1.2em; font-size: 0.8em;
padding: 0; padding: 3px;
margin: 0; margin: 0;
display: table-cell; display: table-cell;
vertical-align: middle; vertical-align: middle;

23
pandora_console/include/styles/pandora.css
View File

@ -468,6 +468,12 @@ select:-internal-list-box {
.align-top td { .align-top td {
vertical-align: top; vertical-align: top;
} }
.no-td-borders td {
border: none !important;
}
.no-td-padding td {
padding: 0 !important;
}
div#page { div#page {
background: #fbfbfb; background: #fbfbfb;
@ -1809,12 +1815,14 @@ div#main_pure {
/* big_data is used in tactical and logon_ok */ /* big_data is used in tactical and logon_ok */
.big_data { .big_data {
text-decoration: none; text-decoration: none;
font: bold 2em Arial, Sans-serif; font-family: "lato", "Open Sans", sans-serif;
font-size: 2em;
} }
.med_data { .med_data {
text-decoration: none; text-decoration: none;
font: bold 1.5em Arial, Sans-serif; font-family: "lato", "Open Sans", sans-serif;
font-size: 1.5em;
} }
.notify { .notify {
@ -2361,6 +2369,7 @@ td.cellBig {
tr.group_view_data, tr.group_view_data,
.group_view_data { .group_view_data {
color: #3f3f3f; color: #3f3f3f;
font-family: "lato", "Open Sans", sans-serif;
} }
tr.group_view_crit, tr.group_view_crit,
@ -3292,7 +3301,8 @@ table#policy_modules td * {
color: #fff; color: #fff;
margin: 2px; margin: 2px;
padding: 10px 30px; padding: 10px 30px;
font-size: 15px; font-size: 16px;
font-family: "lato-bolder", "Open Sans", sans-serif;
font-weight: bold; font-weight: bold;
border-radius: 2px; border-radius: 2px;
} }
@ -5913,7 +5923,7 @@ div#status_pie {
display: flex; display: flex;
align-items: center; align-items: center;
padding: 20px; padding: 20px;
padding-bottom: 10px; padding-bottom: 0;
} }
.agent_details_agent_name { .agent_details_agent_name {
@ -6038,13 +6048,10 @@ div#status_pie {
.white_table thead tr:first-child > th { .white_table thead tr:first-child > th {
border-top-left-radius: 4px; border-top-left-radius: 4px;
border-top-right-radius: 4px; border-top-right-radius: 4px;
border-bottom: 1px solid #e2e2e2;
} }
.white_table tbody tr:first-child > td { .white_table tbody tr:first-child > td {
border-top: 1px solid #e2e2e2;
}
.white_table tbody tr:first-child td {
padding-top: 25px; padding-top: 25px;
} }

12
pandora_console/operation/agentes/estado_generalagente.php
View File

@ -306,18 +306,12 @@ $table_contact->data[] = $data;
$data = []; $data = [];
$table_contact->colspan[2][0] = 2;
$data[0] = '<b>'.__('Next contact').'</b>'; $data[0] = '<b>'.__('Next contact').'</b>';
$progress = agents_get_next_contact($id_agente); $progress = agents_get_next_contact($id_agente);
$table_contact->data[] = $data; $data[1] = ui_progress(
$data = [];
$table_contact->colspan[3][0] = 2;
$data[0] = ui_progress(
$progress, $progress,
'60%', '100%',
2, 1.8,
'#BBB', '#BBB',
true, true,
($agent['intervalo'] * (100 - $progress) / 100).' s' ($agent['intervalo'] * (100 - $progress) / 100).' s'

4
pandora_console/operation/agentes/tactical.php
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 = ''; $table->class = 'info_table no-td-borders';
$table->cellpadding = 2; $table->cellpadding = 2;
$table->cellspacing = 2; $table->cellspacing = 2;
$table->border = 0; $table->border = 0;
@ -130,7 +130,7 @@ $table->head = [];
$table->data = []; $table->data = [];
$table->style = []; $table->style = [];
$table->head[0] = '<span>'.__('Report of State').'</span>'; $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) {