Revert "Merge pull request #1328 from alphagov/notification-page-reworked"

This reverts commit 1797162248, reversing
changes made to 95b4d9eb31.
This commit is contained in:
Chris Hill-Scott
2017-06-23 15:56:25 +01:00
parent 5c0f6796e4
commit b450a349a3
21 changed files with 195 additions and 182 deletions
@@ -5,9 +5,7 @@
{% if job.job_status == 'scheduled' %}
<p>
Sending
<a href="{{ url_for('.view_template_version', service_id=current_service.id, template_id=template.id, version=template_version) }}">{{ template.name }}</a>
{{ job.scheduled_for|format_datetime_relative }}
Sending will start {{ job.scheduled_for|format_datetime_relative }}
</p>
<div class="page-footer">
<form method="post">
@@ -50,10 +48,7 @@
field_headings_visible=False
) %}
{% call row_heading() %}
<a class="file-list-filename" href="{{ url_for('.view_notification', service_id=current_service.id, notification_id=item.id) }}">{{ item.to }}</a>
<p class="file-list-hint">
{{ item.preview_of_content }}
</p>
<p>{{ item.to }}</p>
{% endcall %}
{{ notification_status_field(item) }}
{% endcall %}
+1 -1
View File
@@ -1,5 +1,5 @@
<div class="ajax-block-container">
<p class='bottom-gutter'>
<p class='heading-small bottom-gutter'>
{% if job.scheduled_for %}
{% if job.processing_started %}
Sent by {{ job.created_by.name }} on {{ job.processing_started|format_datetime_short }}
@@ -1,13 +1,6 @@
<div class="ajax-block-container">
<p class="notification-status {{ notification.status|format_notification_status_as_field_status }}">
{% 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 %}
<p class='heading-small bottom-gutter'>
Sent {% if notification.created_by %}by {{ notification.created_by.name }} {% endif %}
on {{ notification.created_at|format_datetime_short }}
</p>
</div>