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

Merge pull request #2369 from alphagov/align-pending

Browse Source 
Format ‘pending’ messages the same as ‘sending’
This commit is contained in:
Chris Hill-Scott
2018-10-11 11:21:56 +01:00
committed by GitHub
parent 9bc0b6ecd4 0d0d95a75a
commit 6b6a19eb2d
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/templates/components/table.html
View File

@@ -143,6 +143,9 @@
{% macro notification_status_field(notification) %} {% macro notification_status_field(notification) %}
{% set displayed_on_single_line = notification.status in ['created', 'pending', 'sending', 'delivered'] %}
{% if not notification %} {% if not notification %}
{% call field(align='right') %}{% endcall %} {% call field(align='right') %}{% endcall %}
{% else %} {% else %}
@@ -150,7 +153,7 @@
status=notification.status|format_notification_status_as_field_status(notification.notification_type), status=notification.status|format_notification_status_as_field_status(notification.notification_type),
align='right' align='right'
) %} ) %}
{% if notification.status in ['created', 'sending', 'delivered'] %}<span class="align-with-message-body">{% endif %} {% if displayed_on_single_line %}<span class="align-with-message-body">{% endif %}
{% if notification.status|format_notification_status_as_url %} {% if notification.status|format_notification_status_as_url %}
<a href="{{ notification.status|format_notification_status_as_url }}"> <a href="{{ notification.status|format_notification_status_as_url }}">
{% endif %} {% endif %}
@@ -172,7 +175,7 @@
) }} ) }}
{% endif %} {% endif %}
</span> </span>
{% if notification.status in ['created', 'sending', 'delivered'] %}</span>{% endif %} {% if displayed_on_single_line %}</span>{% endif %}
{% endcall %} {% endcall %}
{% endif %} {% endif %}
{% endmacro %} {% endmacro %}