editing and creating new preview functions and backlinks

app/templates/views/check/ok.html

@@ -41,50 +41,11 @@
       <h3 id="{{ file_contents_header_id }}">{{ original_file_name }}</h3>
       {% endif %}
       {% set button_text %}
-        Preview send
-        <!-- {{ count_of_recipients|message_count(template.template_type) }} -->
+        Preview
       {% endset %}
       {{ usaButton({ "text": button_text }) }}
 
     </form>
   </div>
 
-  <!-- <div class="fullscreen-content" data-module="fullscreen-table">
-    {% call(item, row_number) list_table(
-      recipients.displayed_rows,
-      caption=original_file_name,
-      caption_visible=False,
-      field_headings=[
-        '<span class="usa-sr-only">Row in file</span><span aria-hidden="true">1</span>'|safe
-      ] + recipients.column_headers
-    ) %}
-      {% call index_field() %}
-        <span>
-          {% if (item.index + 2) == preview_row %}
-            {{ item.index + 2 }}
-          {% else %}
-            <a class="usa-link" href="{{ url_for('.check_messages', service_id=current_service.id, template_id=template.id, upload_id=upload_id, row_index=(item.index + 2), original_file_name=original_file_name) }}">{{ item.index + 2 }}</a>
-          {% endif %}
-        </span>
-      {% endcall %}
-      {% for column in recipients.column_headers %}
-        {% if item[column].ignore %}
-          {{ text_field(item[column].data or '', status='default') }}
-        {% else %}
-          {{ text_field(item[column].data or '') }}
-        {% endif %}
-      {% endfor %}
-      {% if item[None].data %}
-        {% for column in item[None].data %}
-          {{ text_field(column, status='default') }}
-        {% endfor %}
-      {% endif %}
-    {% endcall %}
-  </div> -->
-
-  <!-- {% if count_of_displayed_recipients < count_of_recipients %}
-    <p class="table-show-more-link">
-      Only showing the first {{ count_of_displayed_recipients }} rows
-    </p>
-  {% endif %} -->
 {% endblock %}

app/templates/views/check/preview.html

@@ -14,35 +14,23 @@
 
 
 {% block backLink %}
-  {{ usaBackLink({ "href": back_link }) }}
+  {{ usaBackLink({ "href": back_link_from_preview }) }}
 {% endblock %}
 
 {% block maincolumn_content %}
 
-  {{ page_header('Send messages') }}
+  {{ page_header('Preview') }}
   <h2 id="{{ file_contents_header_id }}">Message</h2>
-  {% if data %}
-    <p>Time: {{data | format_datetime_short_america}}</p>
+  {% if scheduled_for %}
+    <p class="sms-message-sender">Time: {{scheduled_for}}</p>
   {% endif %}
-  <p class="sms-message-sender">File: {{metadata_kwargs.original_file_name}}</p>
+  <p class="sms-message-sender">File: {{original_file_name}}</p>
   {{ template|string }}
   <div class="bottom-gutter-3-2">
     <form method="post" enctype="multipart/form-data" action="{{url_for('main.start_job', service_id=current_service.id, upload_id=upload_id)}}" class='page-footer'>
       <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
-      <!-- {% if choose_time_form %}
-        {{ choose_time_form.scheduled_for(param_extensions={
-          'formGroup': {'classes': 'bottom-gutter-2-3'},
-          'attributes': {
-            'data-module': 'radio-select',
-            'data-categories': choose_time_form.scheduled_for.categories|join(','),
-            'data-show-now-as-default': 'true'
-          }
-        }) }}
-      {% endif %} -->
       {% if not request.args.from_test %}
-
       <h2 class="font-body-lg">Preview list</h2>
-
       <ul class="usa-icon-list">
         <li class="usa-icon-list__item">
           <div class="usa-icon-list__icon" >
@@ -53,8 +41,6 @@
           </div>
         </li>
       </ul>
-
-
       <div>
         {% call(item, row_number) list_table(
           recipients.displayed_rows,
@@ -76,25 +62,15 @@
           {% endif %}
         {% endcall %}
       </div>
-
       {% endif %}
-      <p>The service be charged 10 message parts for a total of 20 messages when this batch it sent
-        There are 480 of 500 messages remaining in your service</p>
+      <!-- <p>The service be charged 10 message parts for a total of 20 messages when this batch it sent
+        There are 480 of 500 messages remaining in your service</p> -->
       <h3>Does everything look good?</h3>
       {% set button_text %}
         Send
-        <!-- {{ count_of_recipients|message_count(template.template_type) }} -->
       {% endset %}
       {{ usaButton({ "text": button_text }) }}
 
     </form>
   </div>
-
-
-
-  <!-- {% if count_of_displayed_recipients < count_of_recipients %}
-    <p class="table-show-more-link">
-      Only showing the first {{ count_of_displayed_recipients }} rows
-    </p>
-  {% endif %} -->
 {% endblock %}

app/templates/views/notifications/check.html

@@ -40,17 +40,16 @@
       {% endcall %}
     </div>
   {% else %}
-    {{ page_header('Preview of ‘{}’'.format(template.name)) }}
+    {{ page_header('Select delivery time') }}
   {% endif %}
 
   {{ template|string }}
 
   <div class="js-stick-at-bottom-when-scrolling">
     <form method="post" enctype="multipart/form-data" action="{{url_for(
-        'main.send_notification',
+        'main.preview_notification',
         service_id=current_service.id,
-        template_id=template.id,
-        help='3' if help else 0
+        template_id=template.id
       )}}" class='page-footer'>
       <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
       {% if not error %}
@@ -64,7 +63,9 @@
             }
           }) }}
         {% endif %}
-        {% set button_text %}Send 1 {{ 1|message_count_label(template.template_type, suffix='') }}{% endset %}
+        {% set button_text %}
+        Preview
+        {% endset %}
         {{ usaButton({ "text": button_text }) }}
       {% endif %}
     </form>

app/templates/views/notifications/preview.html

@@ -0,0 +1,65 @@
+{% extends "withnav_template.html" %}
+{% from "components/banner.html" import banner_wrapper %}
+{% from "components/page-header.html" import page_header %}
+{% from "components/components/back-link/macro.njk" import usaBackLink %}
+{% from "components/components/button/macro.njk" import usaButton %}
+
+{% block service_page_title %}
+  {{ "Error" if error else "Preview of ‘{}’".format(template.name) }}
+{% endblock %}
+
+{% block backLink %}
+  {{ usaBackLink({ "href": back_link_from_preview }) }}
+{% endblock %}
+
+{% block maincolumn_content %}
+  {% if error == 'not-allowed-to-send-to' %}
+    <div class="bottom-gutter">
+      {% call banner_wrapper(type='dangerous') %}
+        {% with
+          count_of_recipients=1,
+          template_type_label=(
+            'phone number' if template.template_type == 'sms' else 'email address'
+          )
+        %}
+          {% include "partials/check/not-allowed-to-send-to.html" %}
+        {% endwith %}
+      {% endcall %}
+    </div>
+  {% elif error == 'too-many-messages' %}
+    <div class="bottom-gutter">
+      {% call banner_wrapper(type='dangerous') %}
+        {% include "partials/check/too-many-messages.html" %}
+      {% endcall %}
+    </div>
+  {% elif error == 'message-too-long' %}
+    {# the only row_errors we can get when sending one off messages is that the message is too long #}
+    <div class="bottom-gutter">
+      {% call banner_wrapper(type='dangerous') %}
+        {% include "partials/check/message-too-long.html" %}
+      {% endcall %}
+    </div>
+  {% else %}
+    {{ page_header('Preview of ‘{}’'.format(template.name)) }}
+  {% endif %}
+
+  {{ template|string }}
+
+  <div class="js-stick-at-bottom-when-scrolling">
+    <form method="post" enctype="multipart/form-data" action="{{url_for(
+        'main.send_notification',
+        service_id=current_service.id,
+        template_id=template.id,
+        help='3' if help else 0
+      )}}" class='page-footer'>
+      <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
+      {% if not error %}
+        {% set button_text %}
+        Send
+        {% endset %}
+        {{ usaButton({ "text": button_text }) }}
+      {% endif %}
+    </form>
+  </div>
+
+{% endblock %}