darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-06-18 04:06:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove verbs from old alerts

Browse Source 
Now we’ve split the old alerts onto two pages the verbs (‘Broadcast’ and
‘Rejected’) will always be the same for each alert – so they’re not
adding any differentiation.

The specifics of what the datetime means is available on the page for
each alert.

Removing the verbs makes the page a bit less cluttered and makes it
easier to scan down the right hand column.
This commit is contained in:
Chris Hill-Scott
2021-04-08 13:46:40 +01:00
parent 4da38e42e3
commit 06f2c7eaaa
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/templates/views/broadcast/partials/dashboard-table.html
View File

@@ -20,7 +20,7 @@
</p>
{% elif item.status == 'rejected' %}
<p class="govuk-body govuk-!-margin-bottom-0 govuk-hint">
Rejected {{ item.updated_at|format_datetime_relative }}
{{ item.updated_at|format_date_human|title }} at {{ item.updated_at|format_time }}
</p>
{% elif item.status == 'broadcasting' %}
<p class="govuk-body govuk-!-margin-bottom-0 live-broadcast">
@@ -28,7 +28,7 @@
</p>
{% else %}
<p class="govuk-body govuk-!-margin-bottom-0 govuk-hint">
Broadcast {{ item.starts_at|format_datetime_relative }}
{{ item.starts_at|format_date_human|title }} at {{ item.starts_at|format_time }}
</p>
{% endif %}
</div>

6
tests/app/main/views/test_broadcast.py
View File

@@ -420,8 +420,8 @@ def test_previous_broadcasts_page(
normalize_spaces(row.text)
for row in page.select('.ajax-block-container')[0].select('.file-list')
] == [
'Example template This is a test Broadcast yesterday at 2:20pm England Scotland',
'Example template This is a test Broadcast yesterday at 2:20am England Scotland',
'Example template This is a test Yesterday at 2:20pm England Scotland',
'Example template This is a test Yesterday at 2:20am England Scotland',
]
button = page.select_one(
@@ -455,7 +455,7 @@ def test_rejected_broadcasts_page(
normalize_spaces(row.text)
for row in page.select('.ajax-block-container')[0].select('.file-list')
] == [
'Example template This is a test Rejected today at 1:20am England Scotland',
'Example template This is a test Today at 1:20am England Scotland',
]
button = page.select_one(