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

This reverts commit 1797162248, reversing
changes made to 95b4d9eb31.

app/templates/components/table.html

@@ -120,7 +120,6 @@
 
 {% macro notification_status_field(notification) %}
   {% call field(status=notification.status|format_notification_status_as_field_status, align='right') %}
-    {% if notification.status in ['created', 'sending', 'delivered'] %}<span class="align-with-message-body">{% endif %}
     {% if notification.status|format_notification_status_as_url %}
       <a href="{{ notification.status|format_notification_status_as_url }}">
     {% endif %}
@@ -136,7 +135,6 @@
         (notification.updated_at or notification.created_at)|format_datetime_short
       ) }}
     </span>
-    {% if notification.status in ['created', 'sending', 'delivered'] %}</span>{% endif %}
   {% endcall %}
 {% endmacro %}
 

app/templates/main_nav.html

@@ -32,7 +32,7 @@
             Notify delivers the message
           </p>
           {% if help == '3' %}
-            <a href='{{ url_for(".go_to_dashboard_after_tour", service_id=current_service.id, example_template_id=template_id) }}'>
+            <a href='{{ url_for(".go_to_dashboard_after_tour", service_id=current_service.id, example_template_id=template.id) }}'>
               Now go to your dashboard
             </a>
           {% endif %}

app/templates/partials/jobs/notifications.html

@@ -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 %}

app/templates/partials/jobs/status.html

@@ -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 }}

app/templates/partials/notifications/status.html

@@ -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>

app/templates/views/activity/notifications.html

@@ -17,9 +17,19 @@
     ) %}
 
       {% 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>
+          {{ item.to }}
+        </p>
+        <p class="hint">
+          {% if item.job and item.job.original_file_name == 'Report' %}
+            <a href="{{ url_for('.view_template_version', service_id=current_service.id, template_id=item.template.id, version=item.template_version) }}">{{ item.template.name }}</a>
+            sent to one recipient
+          {% elif item.job %}
+            From <a href="{{ url_for(".view_job", service_id=current_service.id, job_id=item.job.id) }}">{{ item.job.original_file_name }}</a>
+          {% else %}
+            <a href="{{ url_for('.view_template_version', service_id=current_service.id, template_id=item.template.id, version=item.template_version) }}">{{ item.template.name }}</a>
+            from an API call
+          {% endif %}
         </p>
       {% endcall %}
 

app/templates/views/dashboard/all-template-statistics.html

@@ -41,9 +41,11 @@
             field_headings_visible=False
           ) %}
             {% call row_heading() %}
-              <a class="file-list-filename" href="{{ url_for('.view_template', service_id=current_service.id, template_id=item.id) }}">{{ item.name }}</a>
-              <span class="file-list-hint">
-                {{ message_count_label(1, item.type, suffix='template')|capitalize }}
+              <span class="spark-bar-label">
+                <a href="{{ url_for('.view_template', service_id=current_service.id, template_id=item.id) }}">{{ item.name }}</a>
+                <span class="file-list-hint">
+                  {{ message_count_label(1, item.type, suffix='template')|capitalize }}
+                </span>
               </span>
             {% endcall %}
             {{ spark_bar_field(item.requested_count, most_used_template_count) }}

app/templates/views/dashboard/inbox.html

@@ -31,10 +31,10 @@
         >
           {{ item.user_number | format_phone_number_human_readable }}
         </a>
-        <span class="file-list-hint">{{ item.content }}</span>
+        <span class="wide-left-hand-column">{{ item.content }}</span>
       {% endcall %}
       {% call field(align='right') %}
-        <span class="align-with-message-body">
+        <span class="file-list-hint align-with-message-body">
           {{ item.created_at | format_delta }}
         </span>
       {% endcall %}

app/templates/views/dashboard/template-statistics.html

@@ -17,9 +17,11 @@
   ) %}
 
     {% call row_heading() %}
-      <a class="file-list-filename" href="{{ url_for('.view_template', service_id=current_service.id, template_id=item.template_id) }}">{{ item.template_name }}</a>
-      <span class="file-list-hint">
-        {{ message_count_label(1, item.template_type, suffix='template')|capitalize }}
+      <span class="spark-bar-label">
+        <a href="{{ url_for('.view_template', service_id=current_service.id, template_id=item.template_id) }}">{{ item.template_name }}</a>
+        <span class="file-list-hint">
+          {{ message_count_label(1, item.template_type, suffix='template')|capitalize }}
+        </span>
       </span>
     {% endcall %}
     {% if template_statistics|length > 1 %}

app/templates/views/jobs/job.html

@@ -13,8 +13,17 @@
       {{ uploaded_file_name }}
     </h1>
 
+    {{ template|string }}
+
     {{ ajax_block(partials, updates_url, 'status', finished=finished) }}
     {{ ajax_block(partials, updates_url, 'counts', finished=finished) }}
     {{ ajax_block(partials, updates_url, 'notifications', finished=finished) }}
 
+    {% if not help %}
+      {{ page_footer(
+        secondary_link=url_for('.view_template', service_id=current_service.id, template_id=template.id),
+        secondary_link_text='Back to {}'.format(template.name)
+      ) }}
+    {% endif %}
+
 {% endblock %}

app/templates/views/notifications/notification.html

@@ -1,7 +1,6 @@
 {% extends "withnav_template.html" %}
 {% from "components/banner.html" import banner %}
 {% from "components/ajax-block.html" import ajax_block %}
-{% from "components/message-count-label.html" import message_count_label %}
 {% from "components/page-footer.html" import page_footer %}
 
 {% block service_page_title %}
@@ -11,23 +10,18 @@
 {% block maincolumn_content %}
 
     <h1 class="heading-large">
-      {{ message_count_label(1, template.template_type, suffix='') | capitalize }}
+      Report
     </h1>
 
-    <p>
-      <a href="{{ url_for('.view_template', service_id=current_service.id, template_id=template.id) }}">{{ template.name }}</a>
-      sent
-      {% if job and job.original_file_name != 'Report' %}
-        from
-        <a href="{{ url_for('.view_job', service_id=current_service.id, job_id=job.id) }}">{{ job.original_file_name }}</a>
-      {% elif created_by %}
-        by {{ created_by.name }}
-      {% endif %}
-      on {{ created_at|format_datetime_short }}
-    </p>
-
     {{ template|string }}
 
     {{ ajax_block(partials, updates_url, 'status', finished=finished) }}
+    {{ ajax_block(partials, updates_url, 'counts', finished=finished) }}
+    {{ ajax_block(partials, updates_url, 'notifications', finished=finished) }}
+
+    {{ page_footer(
+      secondary_link=url_for('.view_template', service_id=current_service.id, template_id=template.id),
+      secondary_link_text='Back to {}'.format(template.name)
+    ) }}
 
 {% endblock %}