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

Refactor notification status into its own field type

Browse Source
This commit is contained in:
Chris Hill-Scott
2016-09-09 15:40:27 +01:00
parent 17d5af1a6e
commit 95506e7c3b
3 changed files with 24 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,3 +104,23 @@
{% macro hidden_field_heading(text) %}
<span class="visuallyhidden">{{ text }}</span>
{%- endmacro %}
{% macro notification_status_field(notification) %}
{% call field(status=notification.status|format_notification_status_as_field_status, align='right') %}
{% if notification.status|format_notification_status_as_url %}
<a href="{{ notification.status|format_notification_status_as_url }}">
{% endif %}
{{ notification.status|format_notification_status(
notification.template.template_type
) }}
{% if notification.status|format_notification_status_as_url %}
</a>
{% endif %}
<span class="status-hint">
{{ notification.status|format_notification_status_as_time(
(notification.updated_at or notification.created_at)|format_datetime_short
) }}
</span>
{% endcall %}
{% endmacro %}

22
app/templates/partials/jobs/notifications.html
View File

@@ -1,4 +1,4 @@
{% from "components/table.html" import list_table, field, right_aligned_field_heading, date_field, row_heading %}
{% from "components/table.html" import list_table, field, right_aligned_field_heading, date_field, row_heading, notification_status_field %}
{% from "components/page-footer.html" import page_footer %}
<div class="ajax-block-container">
@@ -50,25 +50,7 @@
{% call row_heading() %}
<p>{{ item.to }}</p>
{% endcall %}
{% call field(
align='right',
status=item.status|format_notification_status_as_field_status
) %}
{% if item.status|format_notification_status_as_url %}
<a href="{{ item.status|format_notification_status_as_url }}">
{% endif %}
{{ item.status|format_notification_status(
item.template.template_type
) }}
{% if item.status|format_notification_status_as_url %}
</a>
{% endif %}
<span class="status-hint">
{{ item.status|format_notification_status_as_time(
(item.updated_at or item.created_at)|format_datetime_short
) }}
</span>
{% endcall %}
{{ notification_status_field(item) }}
{% endcall %}
{% if more_than_one_page %}

23
app/templates/views/notifications.html
View File

@@ -1,5 +1,5 @@
{% extends "withnav_template.html" %}
{% from "components/table.html" import list_table, field, text_field, link_field, right_aligned_field_heading, hidden_field_heading, row_heading, notification_status_field %}
{% from "components/table.html" import list_table, field, text_field, link_field, right_aligned_field_heading, hidden_field_heading, row_heading, date_field, notification_status_field %}
{% from "components/previous-next-navigation.html" import previous_next_navigation %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/pill.html" import pill %}
@@ -68,26 +68,7 @@
</p>
{% endcall %}
{% call field(
align='right',
status=item.status|format_notification_status_as_field_status
) %}
{% if item.status|format_notification_status_as_url %}
<a href="{{ item.status|format_notification_status_as_url }}">
{% endif %}
{{ item.status|format_notification_status(
item.template.template_type
) }}
{% if item.status|format_notification_status_as_url %}
</a>
<br>
{% endif %}
<span class="status-hint">
{{ item.status|format_notification_status_as_time(
(item.updated_at or item.created_at)|format_datetime_short
) }}
</span>
{% endcall %}
{{ notification_status_field(item) }}
{% endcall %}
{% if notifications %}