Merge remote-tracking branch 'origin/develop' into fix/styles

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;
     }
 

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[] = '<b>'.__('Timestamp').'</b>';

pandora_console/include/functions_events.php

@@ -1990,7 +1990,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.
@@ -2524,7 +2524,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'],
@@ -2674,7 +2674,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.
@@ -2918,9 +2918,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;
@@ -2984,7 +2985,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 +3140,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');
@@ -3211,8 +3212,8 @@ function events_page_general($event)
         true,
         [
             'class'  => 'image_status',
-            'width'  => 12,
-            'height' => 12,
+            'width'  => 61,
+            'height' => 28,
             'title'  => $event_criticity,
         ]
     );
@@ -3322,7 +3323,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", '&#x0a;'], '<br>', $event_comments);

pandora_console/include/styles/pandora.css

@@ -3699,28 +3699,29 @@ 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: #f9f9f9;
   border-top: 1px solid #e0e0e0;
   border-bottom: 1px solid #e0e0e0;
 }
 
-table.events_show_more_table tr td {
+table.table_modal_alternate tr td {
   height: 33px;
   max-height: 33px;
   min-height: 33px;
 }
 
-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;

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');

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');