diff --git a/pandora_console/images/alert_recovered@svg.svg b/pandora_console/images/alert_recovered@svg.svg new file mode 100644 index 0000000000..09f84d6215 --- /dev/null +++ b/pandora_console/images/alert_recovered@svg.svg @@ -0,0 +1,9 @@ + + + + Dark / 20 / alert@svg + Created with Sketch. + + + + \ No newline at end of file diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php index 593fa9a975..7e8341c4a1 100644 --- a/pandora_console/include/ajax/events.php +++ b/pandora_console/include/ajax/events.php @@ -2065,14 +2065,6 @@ if ($table_events) { // (propagate ACL funct!). $groups = users_get_groups($config['id_user']); - $tags_condition = tags_get_acl_tags( - $config['id_user'], - array_keys($groups), - 'ER', - 'event_condition', - 'AND' - ); - $tableEvents24h = new stdClass(); $tableEvents24h->class = 'filter_table'; $tableEvents24h->styleTable = 'border: 0;padding: 0;margin: 0 0 10px;'; @@ -2107,7 +2099,7 @@ if ($table_events) { ); } else { events_print_event_table( - 'estado <> 1 '.$tags_condition, + 'estado <> 1', 200, '100%', false, diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index f709fe2b4c..5534897e84 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -2593,7 +2593,7 @@ function events_print_type_img( switch ($type) { case 'alert_recovered': - $style .= ' alert_module_background_state icon_background_normal '; + $icon = 'images/alert_recovered@svg.svg'; break; case 'alert_manual_validation': @@ -2609,20 +2609,16 @@ function events_print_type_img( case 'going_up_normal': case 'going_down_normal': // This is to be backwards compatible. - // $style .= ' event_module_background_state icon_background_normal'; $icon = 'images/module_ok.png'; break; case 'going_up_warning': $icon = 'images/module_warning.png'; - // $style .= ' event_module_background_state icon_background_warning'; case 'going_down_warning': $icon = 'images/module_warning.png'; - // $style .= ' event_module_background_state icon_background_warning'; break; case 'going_unknown': - // $style .= ' event_module_background_state icon_background_unknown'; $icon = 'images/module_unknown.png'; break; diff --git a/pandora_console/include/styles/events.css b/pandora_console/include/styles/events.css index f552357e42..edf5014385 100644 --- a/pandora_console/include/styles/events.css +++ b/pandora_console/include/styles/events.css @@ -470,37 +470,6 @@ div.multi-response-buttons { margin-bottom: 5px; } -/* -.main_menu_icon_event { - height: 20px; -} -*/ -.event_module_background_state { - mask: url(../../images/modules@svg.svg) no-repeat center / contain; - -webkit-mask: url(../../images/modules@svg.svg) no-repeat center / contain; -} - -.alert_module_background_state { - mask: url(../../images/alert@svg.svg) no-repeat center / contain; - -webkit-mask: url(../../images/alert@svg.svg) no-repeat center / contain; -} - -.icon_background_critical { - background-color: #e63c52; -} - -.icon_background_warning { - background-color: #fcab10; -} - -.icon_background_normal { - background-color: #82b92e; -} - -.icon_background_unknown { - background-color: gray; -} - .events-refr { width: 300px; display: flex;