From 49d270521a96324085854d4f7544727de1f337ba Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Tue, 13 Feb 2024 13:29:38 -0800
Subject: [PATCH] revision requestsed changes

---
 app/assets/sass/uswds/_legacy-styles.scss      |  4 ++--
 app/templates/views/check/ok.html              |  4 ----
 app/templates/views/check/preview.html         | 18 +++++++++---------
 app/templates/views/notifications/preview.html | 10 +++++++---
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/assets/sass/uswds/_legacy-styles.scss b/app/assets/sass/uswds/_legacy-styles.scss
index 242bb0f74..48cd63df8 100644
--- a/app/assets/sass/uswds/_legacy-styles.scss
+++ b/app/assets/sass/uswds/_legacy-styles.scss
@@ -48,8 +48,8 @@
   }
 }
 
-.sms-message-sender, .sms-message-file-name, .sms-message-scheduler {
-  margin: units(1) 0 0;
+.sms-message-sender, .sms-message-file-name, .sms-message-scheduler, .sms-message-template {
+  margin: units(1) 0 units(1);
 }
 
 .sms-message-recipient {
diff --git a/app/templates/views/check/ok.html b/app/templates/views/check/ok.html
index 95fd1abea..6a925c7d1 100644
--- a/app/templates/views/check/ok.html
+++ b/app/templates/views/check/ok.html
@@ -34,10 +34,6 @@
         }) }}
       {% endif %}
 
-      {% if not request.args.from_test %}
-      <h2 class="font-body-lg">Send list</h2>
-      <h3 id="{{ file_contents_header_id }}">{{ original_file_name }}</h3>
-      {% endif %}
       {% set button_text %}
         Preview
       {% endset %}
diff --git a/app/templates/views/check/preview.html b/app/templates/views/check/preview.html
index ae8ecea91..379db7519 100644
--- a/app/templates/views/check/preview.html
+++ b/app/templates/views/check/preview.html
@@ -21,16 +21,16 @@
 
   {{ page_header('Preview') }}
   <h2 id="{{ file_contents_header_id }}">Message</h2>
-  {% if scheduled_for %}
-    <p class="sms-message-scheduler">Time: {{scheduled_for}}</p>
-  {% endif %}
+    <p class="sms-message-scheduler">Scheduled:
+    {{ scheduled_for if scheduled_for else 'Now'}}</p>
   <p class="sms-message-file-name">File: {{original_file_name}}</p>
+  <p class="sms-message-template">Template: {{template.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 not request.args.from_test %}
-      <h2 class="font-body-lg">Preview list</h2>
+      <h2 class="font-body-lg">Recipients list</h2>
       <ul class="usa-icon-list">
         <li class="usa-icon-list__item">
           <div class="usa-icon-list__icon" >
@@ -41,11 +41,11 @@
           </div>
         </li>
       </ul>
-      <div>
+      <div class="usa-table-container--scrollable" tabindex="0">
         {% call(item, row_number) list_table(
           recipients.displayed_rows,
-          caption=original_file_name,
-          caption_visible=False,
+          caption="Note: Only the first 5 rows are dislayed here.",
+          caption_visible=True,
           field_headings=recipients.column_headers
         ) %}
           {% for column in recipients.column_headers %}
@@ -63,10 +63,10 @@
         {% endcall %}
       </div>
       {% endif %}
-      <p>Placeholder: This message will be delivered to <b>400 phone numbers</b> and will use a total of <b>800</b> message parts, leaving Washington DSHS with <b>249,200</b> message parts remaining.</p>
+      <p>Placeholder: This message will be delivered to <b>400 phone numbers</b> and will use a total of <b>800 message parts</b>, leaving Washington DSHS with <b>249,200 message parts remaining</b>.</p>
       <h3>Does everything look good?</h3>
       {% set button_text %}
-        Send
+        {{ "Scheduled" if scheduled_for else 'Send'}}
       {% endset %}
       {{ usaButton({ "text": button_text }) }}
 
diff --git a/app/templates/views/notifications/preview.html b/app/templates/views/notifications/preview.html
index 468e91f3b..b0b66efe7 100644
--- a/app/templates/views/notifications/preview.html
+++ b/app/templates/views/notifications/preview.html
@@ -40,9 +40,13 @@
       {% endcall %}
     </div>
   {% else %}
-    {{ page_header('Preview of ‘{}’'.format(template.name)) }}
+    {{ page_header('Preview') }}
   {% endif %}
+  <h2 id="{{ file_contents_header_id }}">Message</h2>
 
+  <p class="sms-message-scheduler">Scheduled:
+    {{ scheduled_for if scheduled_for else 'Now'}}</p>
+  <p class="sms-message-template">Template: {{template.name}}</p>
   {{ template|string }}
 
   <div class="js-stick-at-bottom-when-scrolling">
@@ -53,11 +57,11 @@
         help='3' if help else 0
       )}}" class='page-footer'>
       <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
-      <p>Placeholder: This message will be delivered to <b>400 phone numbers</b> and will use a total of <b>800</b> message parts, leaving Washington DSHS with <b>249,200</b> message parts remaining.</p>
+      <p>Placeholder: This message will be delivered to <b>400 phone numbers</b> and will use a total of <b>800 message parts</b>, leaving Washington DSHS with <b>249,200 message parts remaining</b>.</p>
       <h3>Does everything look good?</h3>
       {% if not error %}
         {% set button_text %}
-        Send
+          {{ "Scheduled" if scheduled_for else 'Send'}}
         {% endset %}
         {{ usaButton({ "text": button_text }) }}
       {% endif %}