Skip to content

Fix/event date email #273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mateodurante merged 3 commits into from
Aug 21, 2026
Merged

Fix/event date email #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10a1a48
Fix/email event date fallback and dark-mode-safe header badge colors
mateodurante Aug 21, 2026
801a906
Fix/default priority colors in fixture
mateodurante Aug 21, 2026
e31404a
Fix/update translation source reference for event report notes
mateodurante Aug 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ngen/fixtures/priority.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"attend_time": "00:00:00",
"solve_time": "01:00:00",
"notification_amount": 3,
"color": "#FFFFFF"
"color": "#FF0000"
}
},
{
Expand All @@ -26,7 +26,7 @@
"attend_time": "00:10:00",
"solve_time": "04:00:00",
"notification_amount": 3,
"color": "#FFFFFF"
"color": "#FF7E11"
}
},
{
Expand All @@ -41,7 +41,7 @@
"attend_time": "01:00:00",
"solve_time": "08:00:00",
"notification_amount": 3,
"color": "#FFFFFF"
"color": "#FFFF00"
}
},
{
Expand All @@ -56,7 +56,7 @@
"attend_time": "04:00:00",
"solve_time": "2 00:00:00",
"notification_amount": 3,
"color": "#FFFFFF"
"color": "#1EA00A"
}
},
{
Expand Down
8 changes: 6 additions & 2 deletions ngen/locale/es/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,11 +291,15 @@ 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:20
#: 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:28
msgid "Notes"
msgstr "Notas"

Expand Down
3 changes: 3 additions & 0 deletions ngen/templates/reports/base_head.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
<!-- If you delete this meta tag, the ground will open and swallow you. -->
<meta name="viewport" content="width=device-width"/>

<meta name="color-scheme" content="light dark"/>
<meta name="supported-color-schemes" content="light dark"/>

<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>{{ config.TEAM_NAME }}</title>
{% if html %}
Expand Down
4 changes: 2 additions & 2 deletions ngen/templates/reports/base_header_right.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<td align="right">
<div class="right-header">
{% if priority %}
<h6 style="color: {{ priority.color }} !important;">
<h6 style="background-color: #000 !important; color: {{ priority.color }} !important;">
{% translate 'Priority' %}{% if not html %}:{% endif %} {% translate priority.name %}
</h6>
{% endif %}
{% if tlp %}
<h6 style="color: {{ tlp.color }} !important;">
<h6 style="background-color: #000 !important; color: {{ tlp.color }} !important;">
TLP:{{ tlp | upper }}
</h6>
{% endif %}
Expand Down
12 changes: 10 additions & 2 deletions ngen/templates/reports/basic_event_report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,17 @@ <h5>{% translate 'Event' %}: {{ event.uuid }}</h5>
<small class="lead"><strong>{% translate 'Affected resources' %}:</strong>
{{ event.address }}</small>
<br>
<small class="lead"><strong>{% translate 'Event Date' %}:</strong>
{{ event.date | date:"Y-m-d H:i:s" }} UTC</small>
{% if event.date or event.created %}
<small class="lead"><strong>
{% if event.date %}
{% translate 'Event Date' %}:
{% else %}
{% translate 'Event creation date' %}:
{% endif %}
</strong>
{{ event.date|default:event.created | date:"Y-m-d H:i:s" }} UTC</small>
<br>
{% endif %}
{% if event.notes %}
<small class="lead"><strong>{% translate 'Notes' %}:</strong>
<div style="word-wrap: break-word;">{{ event.notes | render_report_content:event }}</div>
Expand Down
14 changes: 14 additions & 0 deletions ngen/templates/reports/email.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Loading