From eea9a9e47b697be5f38de5af66dc3f6f4f849566 Mon Sep 17 00:00:00 2001
From: Jorge Rincon <jorge.rincon@pandorafms.com>
Date: Tue, 13 Jun 2023 09:12:32 +0200
Subject: [PATCH 1/2] #11538 Fixed styles for dark theme

---
 .../operation/events/sound_events.php         | 124 +++---------------
 1 file changed, 19 insertions(+), 105 deletions(-)
diff --git a/pandora_console/operation/events/sound_events.php b/pandora_console/operation/events/sound_events.php
index bae7c0cdd2..2e9650ecb7 100644
--- a/pandora_console/operation/events/sound_events.php
+++ b/pandora_console/operation/events/sound_events.php
@@ -60,119 +60,33 @@ echo '<head>';
 ?>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title><?php echo __('Acoustic console'); ?></title>
-<link rel="stylesheet" href="../../include/styles/pandora_minimal.css?v=<?php echo $config['current_package']; ?>" type="text/css" />
-<link rel="stylesheet" href="../../include/styles/js/jquery-ui.min.css?v=<?php echo $config['current_package']; ?>" type="text/css" />
-<link rel="stylesheet" href="../../include/styles/js/jquery-ui_custom.css?v=<?php echo $config['current_package']; ?>" type="text/css" />
-<link rel="stylesheet" href="../../include/styles/select2.min.css?v=<?php echo $config['current_package']; ?>" type="text/css" />
-<link rel="stylesheet" href="../../include/styles/wizard.css?v=<?php echo $config['current_package']; ?>" type="text/css" />
-<link rel="stylesheet" href="../../include/styles/discovery.css?v=<?php echo $config['current_package']; ?>" type="text/css" />
-<script type='text/javascript' src='../../include/javascript/pandora_ui.js?v=<?php echo $config['current_package']; ?>'></script>
-<script type='text/javascript' src='../../include/javascript/jquery.current.js?v=<?php echo $config['current_package']; ?>'></script>
-<script type='text/javascript' src='../../include/javascript/jquery.pandora.js?v=<?php echo $config['current_package']; ?>'></script>
-<script type='text/javascript' src='../../include/javascript/jquery-ui.min.js?v=<?php echo $config['current_package']; ?>'></script>
-<script type='text/javascript' src='../../include/javascript/select2.min.js?v=<?php echo $config['current_package']; ?>'></script>
-<script type='text/javascript' src='../../include/javascript/pandora.js?v=<?php echo $config['current_package']; ?>'></script>
+<link rel="stylesheet" href="<?php echo $config['homeurl']; ?>include/styles/pandora_minimal.css" type="text/css" />
+<link rel="stylesheet" href="<?php echo $config['homeurl']; ?>include/styles/js/jquery-ui.min.css" type="text/css" />
+<link rel="stylesheet" href="<?php echo $config['homeurl']; ?>include/styles/js/jquery-ui_custom.css" type="text/css" />
+<link rel="stylesheet" href="<?php echo $config['homeurl']; ?>include/styles/select2.min.css" type="text/css" />
+<link rel="stylesheet" href="<?php echo $config['homeurl']; ?>include/styles/pandora.css" type="text/css" />
+<?php
+echo ui_require_css_file('wizard', 'include/styles/', true);
+echo ui_require_css_file('discovery', 'include/styles/', true);
+echo ui_require_css_file('sound_events', 'include/styles/', true);
+?>
+<script type='text/javascript' src='<?php echo $config['homeurl']; ?>include/javascript/jquery.current.js'></script>
+<script type='text/javascript' src='<?php echo $config['homeurl']; ?>include/javascript/jquery.pandora.js'></script>
+<script type='text/javascript' src='<?php echo $config['homeurl']; ?>include/javascript/jquery-ui.min.js'></script>
+<script type='text/javascript' src='<?php echo $config['homeurl']; ?>include/javascript/select2.min.js'></script>
+<script type='text/javascript' src='<?php echo $config['homeurl']; ?>include/javascript/pandora.js'></script>
+<script type='text/javascript' src='<?php echo $config['homeurl']; ?>include/javascript/pandora_ui.js'></script>
 
-<style type='text/css'>
-    * {
-        margin: 0;
-        padding: 0;
-    }
-
-    img {
-        border: 0;
-    }
-
-    ul.wizard li > label:not(.p-switch):first-of-type {
-        width: inherit;
-    }
-    form {
-        margin-top: -3px;
-        margin-bottom: 10px;
-    }
-    table {
-        margin-top: 5px;
-    }
-
-    .events_fired {
-        background: white;
-        padding: 20px;
-        overflow: auto;
-        height: 200px;
-        margin-bottom: 5px;
-    }
-
-    .events_fired li {
-        padding: 5px;
-        display: flex;
-        flex-direction: row;
-        justify-content: space-between;
-        align-items: center;
-    }
-    .events_fired li div {
-        margin-right: 10px;
-    }
-
-    .events_fired li div.flex0 {
-        flex: 0;
-    }
-
-    .events_fired li div.flex-time {
-        flex: 0 1 100px;
-        text-align: end;
-    }
-
-    .events_fired li div.mess {
-        width: 100%;
-    }
-
-    .forced_title.mini-criticity {
-        width: 10px;
-        height: 30px;
-    }
-
-    .progressbar {
-        width: 100%;
-        margin: 5px 0px;
-    }
-    .progressbar .inner {
-        height: 10px;
-        animation: progressbar-countdown;
-        /* Placeholder, this will be updated using javascript */
-        animation-duration: 40s;
-        /* We stop in the end */
-        animation-iteration-count: 1;
-        /* Stay on pause when the animation is finished finished */
-        animation-fill-mode: forwards;
-        /* We start paused, we start the animation using javascript */
-        animation-play-state: paused;
-        /* We want a linear animation, ease-out is standard */
-        animation-timing-function: linear;
-    }
-    @keyframes progressbar-countdown {
-        0% {
-            width: 100%;
-            background: #82b92e;
-        }
-        100% {
-            width: 0%;
-            background: #e63c52;
-        }
-    }
-</style>
 <?php
 echo '<link rel="icon" href="../../'.ui_get_favicon().'" type="image/ico" />';
 if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
-    echo '<link rel="stylesheet" href="../../include/styles/pandora_black.css?v='.$config['current_package'].'" type="text/css" />';
+    echo '<link rel="stylesheet" href="../../include/styles/pandora_black.css" type="text/css" />';
 } else {
-    echo '<link rel="stylesheet" href="../../include/styles/pandora.css?v='.$config['current_package'].'" type="text/css" />';
+    echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/css" />';
 }
 
 echo '</head>';
 echo '<body style="overflow: hidden;">';
-echo ui_require_css_file('wizard', 'include/styles/', true);
-echo ui_require_css_file('discovery', 'include/styles/', true);
-echo ui_require_css_file('sound_events', 'include/styles/', true);
 $output = '<div id="tabs-sound-modal">';
     // Header tabs.
     $output .= '<ul class="tabs-sound-modal-options">';
@@ -204,7 +118,7 @@ $output = '<div id="tabs-sound-modal">';
 
         // Content tabs.
         $output .= '<div id="tabs-sound-modal-1">';
-        $output .= '<h3 class="console-configuration">';
+        $output .= '<h3>';
         $output .= __('Console configuration');
         $output .= '</h3>';
         $inputs = [];

From f153e59caf9b5183c29b5b14dd6fb3a7fa80bbe6 Mon Sep 17 00:00:00 2001
From: Jorge Rincon <jorge.rincon@pandorafms.com>
Date: Wed, 14 Jun 2023 13:51:21 +0200
Subject: [PATCH 2/2] #11538 Fixed styles for the Discovered alerts tab

---
 pandora_console/include/styles/pandora_black.css  | 4 ++--
 pandora_console/operation/events/sound_events.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css
index 75aa87e3ab..8e3b422632 100644
--- a/pandora_console/include/styles/pandora_black.css
+++ b/pandora_console/include/styles/pandora_black.css
@@ -252,7 +252,7 @@ tr.group_view_data,
 .group_view_data,
 ol.steps li span,
 ol.steps li a {
-  color: #fff;
+  color: #fff !important;
 }
 
 /* Tabs icons change color */
@@ -753,7 +753,7 @@ form ul.form_flex {
 
 .invert_filter,
 .labels {
-  filter: invert(100%);
+  filter: invert(100%) !important;
 }
 
 .info_table .invert_filter,
diff --git a/pandora_console/operation/events/sound_events.php b/pandora_console/operation/events/sound_events.php
index 2e9650ecb7..4750e53937 100644
--- a/pandora_console/operation/events/sound_events.php
+++ b/pandora_console/operation/events/sound_events.php
@@ -118,7 +118,7 @@ $output = '<div id="tabs-sound-modal">';
 
         // Content tabs.
         $output .= '<div id="tabs-sound-modal-1">';
-        $output .= '<h3>';
+        $output .= '<h3 class="title-discovered-alerts">';
         $output .= __('Console configuration');
         $output .= '</h3>';
         $inputs = [];
