From f6203d47400f3e45a4a7ad54764003454b0275c2 Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Tue, 20 Jun 2023 09:26:52 +0200 Subject: [PATCH 1/3] 11174-Background diagnostic info graphs --- .../include/styles/diagnostics.css | 22 ++++++++++++++++++- pandora_console/include/styles/pandora.css | 2 ++ .../include/styles/pandora_black.css | 7 ++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/styles/diagnostics.css b/pandora_console/include/styles/diagnostics.css index 706038cbd0..579a8777eb 100644 --- a/pandora_console/include/styles/diagnostics.css +++ b/pandora_console/include/styles/diagnostics.css @@ -8,7 +8,7 @@ text-align: center; font-size: 1.5em; font-weight: bolder; - color: #000; + color: var(--text-color); background: var(--secondary-color); padding: 8px; } @@ -47,16 +47,36 @@ font-size: 1.2em; } +.title-self-monitoring { + border-top: 1px solid var(--border-color); + border-right: 1px solid var(--border-color); + border-left: 1px solid var(--border-color); + border-top-left-radius: 8px; + border-top-right-radius: 8px; +} + .container-self-monitoring { display: flex; flex-direction: row; flex-wrap: wrap; + background-color: var(--secondary-color); + border-right: 1px solid var(--border-color); + border-bottom: 1px solid var(--border-color); + border-left: 1px solid var(--border-color); + border-bottom-left-radius: 8px; + border-bottom-right-radius: 8px; + padding-bottom: 15px; } .element-self-monitoring { flex: 2 1 600px; } +.element-self-monitoring > img[data-title="No data"] { + margin-top: 5%; + margin-left: 20%; +} + .footer-self-monitoring { margin: 30px; font-style: italic; diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index b5875c2207..26d07a5aeb 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -31,6 +31,8 @@ --primary-color: #14524f; --secondary-color: #ffffff; --input-border: #c0ccdc; + --border-color: #eee; + --text-color: #333; } /* diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css index 68f179a210..7a5bebd4cb 100644 --- a/pandora_console/include/styles/pandora_black.css +++ b/pandora_console/include/styles/pandora_black.css @@ -20,6 +20,13 @@ Description: The default Pandora FMS theme layout // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +:root { + /* --primary-color: #14524f; */ + --secondary-color: #222; + --text-color: #fff; + /* --input-border: #c0ccdc; */ + --border-color: #484848; +} /* General styles */ body, From 5dbf61b424e1511032b83221a7dedc68b5d065ac Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Thu, 27 Jul 2023 09:46:29 +0200 Subject: [PATCH 2/3] 11174-Timezone iana graph firefox --- .../include/javascript/timezone/src/date.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pandora_console/include/javascript/timezone/src/date.js b/pandora_console/include/javascript/timezone/src/date.js index 63b3a4e94a..0016caadf1 100644 --- a/pandora_console/include/javascript/timezone/src/date.js +++ b/pandora_console/include/javascript/timezone/src/date.js @@ -893,6 +893,17 @@ var utcMillis = typeof dt === "number" ? dt : new Date(dt).getTime(); var t = tz; var zoneList = _this.zones[t]; + + if (typeof zoneList === "undefined") { + zoneList = [ + [-53.46666666666666, "-", "LMT", -2422051200000], + [-60, "C-Eur", "CE%sT", -776556000000], + [-60, "SovietZone", "CE%sT", -725932800000], + [-60, "Germany", "CE%sT", 347068800000], + [-60, "EU", "CE%sT", null] + ]; + } + // Follow links to get to an actual zone while (typeof zoneList === "string") { t = zoneList; From 0eb60cf5c895eefd0d4d0ecdb3b306577e65bc47 Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Thu, 27 Jul 2023 11:24:52 +0200 Subject: [PATCH 3/3] 11174-Timezone iana graph firefox --- pandora_console/operation/agentes/pandora_networkmap.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pandora_console/operation/agentes/pandora_networkmap.php b/pandora_console/operation/agentes/pandora_networkmap.php index be4837ea65..52c376b4f7 100644 --- a/pandora_console/operation/agentes/pandora_networkmap.php +++ b/pandora_console/operation/agentes/pandora_networkmap.php @@ -263,8 +263,7 @@ if ($new_networkmap || $save_networkmap) { 'id_group_map' => $id_group_map, ], ); - hd('Entraaaa', true); - hd($exist, true); + if ($exist !== false) { $result_txt = ui_print_error_message(__('Another network map already exists with this name and group.')); } else {