From 0b4a076798936e53e7b6ff16975142820330e729 Mon Sep 17 00:00:00 2001 From: Tatiana Llorente Date: Mon, 27 May 2019 15:49:10 +0200 Subject: [PATCH 1/3] Changed image for severity in modal events window - #4102 --- .../default/severity_critical_rounded.png | Bin 0 -> 250 bytes .../default/severity_informational_rounded.png | Bin 0 -> 251 bytes .../default/severity_maintenance_rounded.png | Bin 0 -> 246 bytes .../default/severity_major_rounded.png | Bin 0 -> 220 bytes .../default/severity_minor_rounded.png | Bin 0 -> 220 bytes .../default/severity_normal_rounded.png | Bin 0 -> 251 bytes .../default/severity_warning_rounded.png | Bin 0 -> 249 bytes pandora_console/include/ajax/events.php | 14 +++++++------- pandora_console/include/functions_events.php | 11 ++++++----- 9 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 pandora_console/images/status_sets/default/severity_critical_rounded.png create mode 100644 pandora_console/images/status_sets/default/severity_informational_rounded.png create mode 100644 pandora_console/images/status_sets/default/severity_maintenance_rounded.png create mode 100644 pandora_console/images/status_sets/default/severity_major_rounded.png create mode 100644 pandora_console/images/status_sets/default/severity_minor_rounded.png create mode 100644 pandora_console/images/status_sets/default/severity_normal_rounded.png create mode 100644 pandora_console/images/status_sets/default/severity_warning_rounded.png diff --git a/pandora_console/images/status_sets/default/severity_critical_rounded.png b/pandora_console/images/status_sets/default/severity_critical_rounded.png new file mode 100644 index 0000000000000000000000000000000000000000..7fceda18dad688b1eccc63bebbf6b27430565f5c GIT binary patch literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^wm>Yy!3HERP1;@sq$EpRBT9nv(@M${i&7aJQ}UBi z6+Ckj(^G>|6H_V+Po~-c70vNq9xN1B^lw8dxMGCpIXXxv2zj zmNEzxFt|r>F*0A@fAaL#OD|6^m3rO;`QoY|yIGA=A|Y-Zy{Fuw5LQh#vQRMCz9-9M4-JaQ?s o$}8u~#70ZIwsY6y`Z2OG#6OnWnk?Aa2XrTcr>mdKI;Vst0D06|UjP6A literal 0 HcmV?d00001 diff --git a/pandora_console/images/status_sets/default/severity_informational_rounded.png b/pandora_console/images/status_sets/default/severity_informational_rounded.png new file mode 100644 index 0000000000000000000000000000000000000000..fd5e433ece26563296312403d351e64ecc4b0471 GIT binary patch literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^wm>Yy!3HERP1;@sq$EpRBT9nv(@M${i&7aJQ}UBi z6+Ckj(^G>|6H_V+Po~-c70vZ@aSW-r_2$Mx-Ub7K)`y2!78v$i5Zqv4(kFO><0#iu z119N!;PV_Z2Su2;WB#k@U-!N`-CH}$r%Ahe_PtgoFZGpEE%&C(y?x650@Jo2G0%k+ zCz=l|m)NU4=fica&ns36@4RH@|51^dSIQ*g!UD%;HU#4r`(CvNwkpv*a%cZ)u9LJm rms^_he)7FmH_fWu2d+O8Nnj9&liDgYZ{-c3Lm50>{an^LB{Ts5@*7@o literal 0 HcmV?d00001 diff --git a/pandora_console/images/status_sets/default/severity_maintenance_rounded.png b/pandora_console/images/status_sets/default/severity_maintenance_rounded.png new file mode 100644 index 0000000000000000000000000000000000000000..2ec6d98f39a059562c5107196a774513ecd58dad GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^wm>Yy!3HERP1;@sq$EpRBT9nv(@M${i&7aJQ}UBi z6+Ckj(^G>|6H_V+Po~-c70vK;aSW-r_2z~nZ-W6(>%&H-f(8~9g~sUf9tQ-kuVUb| zVBnnWAg_39-Hxlbt{ zRNdwI)cYy!3HERP1;@sq$EpRBT9nv(@M${i&7aJQ}UBi z6+Ckj(^G>|6H_V+Po~-c71epVIEGZ*dUN?8XM+Jx>%$wIF$aBP7Rt>%x_EQN7VQ)f z_X6hL07ovp34i#Vob%*8U740u&(57$Ro!*<#g$cIm2uyVYun}>49Z=4_lxM0UF{-o z?Qd7gKfK`Y(9FgwWs-4Wfg^(P&oP@}{k9ixWY%4kFy79<%-}ayVDmFaJ1d||7(8A5 KT-G@yGywn^F;XG` literal 0 HcmV?d00001 diff --git a/pandora_console/images/status_sets/default/severity_minor_rounded.png b/pandora_console/images/status_sets/default/severity_minor_rounded.png new file mode 100644 index 0000000000000000000000000000000000000000..fd3ea3d2d953985fed85815422f1f81034ef65a8 GIT binary patch literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^wm>Yy!3HERP1;@sq$EpRBT9nv(@M${i&7aJQ}UBi z6+Ckj(^G>|6H_V+Po~-c71epVIEGZ*dUN?8XM+Jx>%$1~0@mpto*Wdl$_zhoaB{Fk z6L*K(3I$eikALh76}R^Yy!3HERP1;@sq$EpRBT9nv(@M${i&7aJQ}UBi z6+Ckj(^G>|6H_V+Po~-c70vZ@aSW-r_2xz(Z-ausu|ktZGleGJ0<{fIf;tbHJ$)A4 zIKU=#kVEb>>s&F5e>wO2r2Y5beZZJ36cc%eXS4Q_Ekdi$RC@fmvF13l?gOt=N}3}4 zJB5FUEG};q{uh-hXKFT4JNBujUCIK-W;R|alZ*>UjQYy!3HERP1;@sq$EpRBT9nv(@M${i&7aJQ}UBi z6+Ckj(^G>|6H_V+Po~-c70vc^aSW-r_2z~lZ-aqA>%-=mj4~TaU73V7G_+V9;`B&J zW#Z)Fc)-QX%gB6v|H;!|FTFgyR90)!gHw;5MJ%~;DKjhioUgIyyH)&A2YaUl2205m zt^c6tww_J>&(>8oS+88yl}uj#V?rYvuarr~g$0hy2*%&$c|srF&9Zc>-f4eSx4HIV o%K3Zh$CcIwevvtlSj=U>py(^MH8r_+1JIcap00i_>zopr0Q5dzRR910 literal 0 HcmV?d00001 diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php index 6ba163c7ed..ed73c58aa5 100644 --- a/pandora_console/include/ajax/events.php +++ b/pandora_console/include/ajax/events.php @@ -456,30 +456,30 @@ if ($get_extended_event) { switch ($event['criticity']) { default: case 0: - $img_sev = 'images/status_sets/default/severity_maintenance.png'; + $img_sev = 'images/status_sets/default/severity_maintenance_rounded.png'; break; case 1: - $img_sev = 'images/status_sets/default/severity_informational.png'; + $img_sev = 'images/status_sets/default/severity_informational_rounded.png'; break; case 2: - $img_sev = 'images/status_sets/default/severity_normal.png'; + $img_sev = 'images/status_sets/default/severity_normal_rounded.png'; break; case 3: - $img_sev = 'images/status_sets/default/severity_warning.png'; + $img_sev = 'images/status_sets/default/severity_warning_rounded.png'; break; case 4: - $img_sev = 'images/status_sets/default/severity_critical.png'; + $img_sev = 'images/status_sets/default/severity_critical_rounded.png'; break; case 5: - $img_sev = 'images/status_sets/default/severity_minor.png'; + $img_sev = 'images/status_sets/default/severity_minor_rounded.png'; break; case 6: - $img_sev = 'images/status_sets/default/severity_major.png'; + $img_sev = 'images/status_sets/default/severity_major_rounded.png'; break; } diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index 52eb525bc1..4f345c1a29 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -2874,7 +2874,7 @@ function events_page_details($event, $server='') $data[1] = ($event['id_alert_am'] == 0) ? ''.__('N/A').'' : ''; $table_details->data[] = $data; - if ($event['id_alert_am'] != 0) { + if ($event['id_alert_am'] == 0) { $data = []; $data[0] = '
'.__('Source').'
'; $data[1] = ''; @@ -2917,9 +2917,10 @@ function events_page_details($event, $server='') true, [ 'class' => 'image_status', - 'width' => 12, - 'height' => 12, + 'width' => 61, + 'height' => 28, 'title' => $alert_priority, + 'style' => 'vertical-align:text-bottom', ] ); $data[1] .= ' '.$alert_priority; @@ -3210,8 +3211,8 @@ function events_page_general($event) true, [ 'class' => 'image_status', - 'width' => 12, - 'height' => 12, + 'width' => 61, + 'height' => 28, 'title' => $event_criticity, ] ); From 016a5b3745b9e83526bd23a7c54106fcee35f44a Mon Sep 17 00:00:00 2001 From: Tatiana Llorente Date: Mon, 27 May 2019 15:51:03 +0200 Subject: [PATCH 2/3] Changed image for severity in modal events window - #4102 --- pandora_console/include/functions_events.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index 4f345c1a29..f501586e13 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -2874,7 +2874,7 @@ function events_page_details($event, $server='') $data[1] = ($event['id_alert_am'] == 0) ? ''.__('N/A').'' : ''; $table_details->data[] = $data; - if ($event['id_alert_am'] == 0) { + if ($event['id_alert_am'] != 0) { $data = []; $data[0] = '
'.__('Source').'
'; $data[1] = ''; From 1eb1120c6ea0f45122aff74bd6d8eaa9b2f3aa40 Mon Sep 17 00:00:00 2001 From: Tatiana Llorente Date: Mon, 27 May 2019 16:18:10 +0200 Subject: [PATCH 3/3] Rename class events_show_more_table to table_modal_alternate - #4102 --- pandora_console/include/ajax/events_extended.php | 2 +- pandora_console/include/functions_events.php | 12 ++++++------ pandora_console/include/styles/pandora.css | 10 +++++----- .../agentes/interface_traffic_graph_win.php | 2 +- pandora_console/operation/agentes/stat_win.php | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pandora_console/include/ajax/events_extended.php b/pandora_console/include/ajax/events_extended.php index 9c6ea27482..1fb3e94c63 100644 --- a/pandora_console/include/ajax/events_extended.php +++ b/pandora_console/include/ajax/events_extended.php @@ -84,7 +84,7 @@ if ($get_extended_info == 1) { $table->head = []; $table->cellspacing = 2; $table->cellpadding = 2; - $table->class = 'events_show_more_table'; + $table->class = 'table_modal_alternate'; $output = []; $output[] = ''.__('Timestamp').''; diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index f501586e13..fc874f2841 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -1989,7 +1989,7 @@ function events_page_responses($event, $childrens_ids=[]) $table_responses->head = []; $table_responses->style[0] = 'height:30px'; $table_responses->style[2] = 'text-align:right;'; - $table_responses->class = 'events_show_more_table'; + $table_responses->class = 'table_modal_alternate'; if (tags_checks_event_acl($config['id_user'], $event['id_grupo'], 'EM', $event['clean_tags'], $childrens_ids)) { // Owner. @@ -2523,7 +2523,7 @@ function events_page_custom_fields($event) $table->width = '100%'; $table->data = []; $table->head = []; - $table->class = 'events_show_more_table'; + $table->class = 'table_modal_alternate'; $all_customs_fields = (bool) check_acl( $config['id_user'], @@ -2673,7 +2673,7 @@ function events_page_details($event, $server='') $table_details->head = []; $table_details->cellspacing = 0; $table_details->cellpadding = 0; - $table_details->class = 'events_show_more_table'; + $table_details->class = 'table_modal_alternate'; /* * Useless switch. @@ -2984,7 +2984,7 @@ function events_page_custom_data($event) $table->width = '100%'; $table->data = []; $table->head = []; - $table->class = 'events_show_more_table'; + $table->class = 'table_modal_alternate'; $json_custom_data = base64_decode($event['custom_data']); $custom_data = json_decode($json_custom_data); @@ -3139,7 +3139,7 @@ function events_page_general($event) $table_general->width = '100%'; $table_general->data = []; $table_general->head = []; - $table_general->class = 'events_show_more_table'; + $table_general->class = 'table_modal_alternate'; $data = []; $data[0] = __('Event ID'); @@ -3322,7 +3322,7 @@ function events_page_comments($event, $childrens_ids=[]) $table_comments->width = '100%'; $table_comments->data = []; $table_comments->head = []; - $table_comments->class = 'events_show_more_table'; + $table_comments->class = 'table_modal_alternate'; $event_comments = $event['user_comment']; $event_comments = str_replace(["\n", ' '], '
', $event_comments); diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 86a461485e..f003802d72 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -3630,27 +3630,27 @@ div.simple_value > a > span.text p { cursor: pointer; } -.events_show_more_table { +.table_modal_alternate { border-spacing: 0px; text-align: left; } /* Modal window - Show More */ -table.events_show_more_table tr:nth-child(odd) td { +table.table_modal_alternate tr:nth-child(odd) td { background-color: #ffffff; } -table.events_show_more_table tr:nth-child(even) td { +table.table_modal_alternate tr:nth-child(even) td { background-color: #f5f5f5; border-top: 1px solid #cacaca; border-bottom: 1px solid #cacaca; } -table.events_show_more_table tr td { +table.table_modal_alternate tr td { height: 22px; padding: 4px; } -table.events_show_more_table tr td:first-child { +table.table_modal_alternate tr td:first-child { width: 35%; font-weight: bold; padding-left: 20px; diff --git a/pandora_console/operation/agentes/interface_traffic_graph_win.php b/pandora_console/operation/agentes/interface_traffic_graph_win.php index e00ed0d254..a7d1257576 100644 --- a/pandora_console/operation/agentes/interface_traffic_graph_win.php +++ b/pandora_console/operation/agentes/interface_traffic_graph_win.php @@ -185,7 +185,7 @@ if ($date > $now) { $table->style[0] = 'text-align:left;'; $table->style[1] = 'text-align:left;'; $table->styleTable = 'margin-bottom: 20px;'; - $table->class = 'events_show_more_table'; + $table->class = 'table_modal_alternate'; $data = []; $data[0] = __('Refresh time'); diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php index ef4a448360..a280318108 100644 --- a/pandora_console/operation/agentes/stat_win.php +++ b/pandora_console/operation/agentes/stat_win.php @@ -238,7 +238,7 @@ $alias = db_get_value('alias', 'tagente', 'id_agente', $id_agent); $table->style[0] = 'text-align:left;'; $table->style[1] = 'text-align:left;'; $table->styleTable = 'margin-bottom: 20px;'; - $table->class = 'events_show_more_table'; + $table->class = 'table_modal_alternate'; $data = []; $data[0] = __('Refresh time');