From 10a1a4830aa47d6bd6f25d41721950923284768d Mon Sep 17 00:00:00 2001 From: Mateo Durante Date: Fri, 21 Aug 2026 14:04:33 +0000 Subject: [PATCH 1/3] Fix/email event date fallback and dark-mode-safe header badge colors --- ngen/locale/es/LC_MESSAGES/django.po | 6 +++++- ngen/templates/reports/base_head.html | 3 +++ ngen/templates/reports/base_header_right.html | 4 ++-- ngen/templates/reports/basic_event_report.html | 12 ++++++++++-- ngen/templates/reports/email.css | 14 ++++++++++++++ 5 files changed, 34 insertions(+), 5 deletions(-) diff --git a/ngen/locale/es/LC_MESSAGES/django.po b/ngen/locale/es/LC_MESSAGES/django.po index 9eced7f8..3f10b8e9 100755 --- a/ngen/locale/es/LC_MESSAGES/django.po +++ b/ngen/locale/es/LC_MESSAGES/django.po @@ -291,10 +291,14 @@ msgstr "Taxonomía" msgid "Affected resources" msgstr "Recursos afectados" -#: ngen/templates/reports/basic_event_report.html:16 +#: ngen/templates/reports/basic_event_report.html:19 msgid "Event Date" msgstr "Fecha del evento" +#: ngen/templates/reports/basic_event_report.html:21 +msgid "Event creation date" +msgstr "Fecha de creación del evento" + #: ngen/templates/reports/basic_event_report.html:20 msgid "Notes" msgstr "Notas" diff --git a/ngen/templates/reports/base_head.html b/ngen/templates/reports/base_head.html index bd636ba4..03d2b53d 100644 --- a/ngen/templates/reports/base_head.html +++ b/ngen/templates/reports/base_head.html @@ -3,6 +3,9 @@ + + + {{ config.TEAM_NAME }} {% if html %} diff --git a/ngen/templates/reports/base_header_right.html b/ngen/templates/reports/base_header_right.html index ebf48b19..f60d73ab 100644 --- a/ngen/templates/reports/base_header_right.html +++ b/ngen/templates/reports/base_header_right.html @@ -3,12 +3,12 @@
{% if priority %} -
+
{% translate 'Priority' %}{% if not html %}:{% endif %} {% translate priority.name %}
{% endif %} {% if tlp %} -
+
TLP:{{ tlp | upper }}
{% endif %} diff --git a/ngen/templates/reports/basic_event_report.html b/ngen/templates/reports/basic_event_report.html index 296442be..1c9db922 100644 --- a/ngen/templates/reports/basic_event_report.html +++ b/ngen/templates/reports/basic_event_report.html @@ -13,9 +13,17 @@
{% translate 'Event' %}: {{ event.uuid }}
{% translate 'Affected resources' %}: {{ event.address }}
-{% translate 'Event Date' %}: - {{ event.date | date:"Y-m-d H:i:s" }} UTC +{% if event.date or event.created %} + + {% if event.date %} + {% translate 'Event Date' %}: + {% else %} + {% translate 'Event creation date' %}: + {% endif %} + + {{ event.date|default:event.created | date:"Y-m-d H:i:s" }} UTC
+{% endif %} {% if event.notes %} {% translate 'Notes' %}:
{{ event.notes | render_report_content:event }}
diff --git a/ngen/templates/reports/email.css b/ngen/templates/reports/email.css index 1dd6cc2c..8acbbce8 100644 --- a/ngen/templates/reports/email.css +++ b/ngen/templates/reports/email.css @@ -425,3 +425,17 @@ ul.sidebar li a h1, ul.sidebar li a h2, ul.sidebar li a h3, ul.sidebar li a h4, background-color: #259152; color: white; } + +/* ------------------------------------- + DARK MODE (keep original colors) +------------------------------------- */ +@media (prefers-color-scheme: dark) { + body { + background-color: #ffffff !important; + color: #222222 !important; + } + + .right-header h6 { + background-color: #000000 !important; + } +} From 801a90627c45202e5948964487b88a2ddf7e0027 Mon Sep 17 00:00:00 2001 From: Mateo Durante Date: Fri, 21 Aug 2026 14:14:14 +0000 Subject: [PATCH 2/3] Fix/default priority colors in fixture --- ngen/fixtures/priority.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ngen/fixtures/priority.json b/ngen/fixtures/priority.json index e4734813..e77d710c 100644 --- a/ngen/fixtures/priority.json +++ b/ngen/fixtures/priority.json @@ -11,7 +11,7 @@ "attend_time": "00:00:00", "solve_time": "01:00:00", "notification_amount": 3, - "color": "#FFFFFF" + "color": "#FF0000" } }, { @@ -26,7 +26,7 @@ "attend_time": "00:10:00", "solve_time": "04:00:00", "notification_amount": 3, - "color": "#FFFFFF" + "color": "#FF7E11" } }, { @@ -41,7 +41,7 @@ "attend_time": "01:00:00", "solve_time": "08:00:00", "notification_amount": 3, - "color": "#FFFFFF" + "color": "#FFFF00" } }, { @@ -56,7 +56,7 @@ "attend_time": "04:00:00", "solve_time": "2 00:00:00", "notification_amount": 3, - "color": "#FFFFFF" + "color": "#1EA00A" } }, { From e31404a27daae58999c002dc4428d2d866838063 Mon Sep 17 00:00:00 2001 From: Mateo Durante Date: Fri, 21 Aug 2026 14:22:34 +0000 Subject: [PATCH 3/3] Fix/update translation source reference for event report notes --- ngen/locale/es/LC_MESSAGES/django.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ngen/locale/es/LC_MESSAGES/django.po b/ngen/locale/es/LC_MESSAGES/django.po index 3f10b8e9..e82af509 100755 --- a/ngen/locale/es/LC_MESSAGES/django.po +++ b/ngen/locale/es/LC_MESSAGES/django.po @@ -299,7 +299,7 @@ msgstr "Fecha del evento" msgid "Event creation date" msgstr "Fecha de creación del evento" -#: ngen/templates/reports/basic_event_report.html:20 +#: ngen/templates/reports/basic_event_report.html:28 msgid "Notes" msgstr "Notas"