Revert "Merge pull request #1336 from alphagov/revert-show-notifications"

This reverts commit 7e354ff341, reversing
changes made to 6f3bcff32f.

app/templates/partials/jobs/notifications.html

@@ -5,7 +5,9 @@
   {% if job.job_status == 'scheduled' %}
 
     <p>
-      Sending will start {{ job.scheduled_for|format_datetime_relative }}
+      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 }}
     </p>
     <div class="page-footer">
       <form method="post">
@@ -48,7 +50,10 @@
         field_headings_visible=False
       ) %}
         {% call row_heading() %}
-          <p>{{ item.to }}</p>
+          <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>
         {% endcall %}
         {{ notification_status_field(item) }}
       {% endcall %}

app/templates/partials/jobs/status.html

@@ -1,5 +1,5 @@
 <div class="ajax-block-container">
-  <p class='heading-small bottom-gutter'>
+  <p class='bottom-gutter'>
     {% if job.scheduled_for %}
       {% if job.processing_started %}
         Sent by {{ job.created_by.name }} on {{ job.processing_started|format_datetime_short }}

app/templates/partials/notifications/status.html

@@ -1,6 +1,13 @@
 <div class="ajax-block-container">
-  <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 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>
 </div>