added new change from ux meeting as requested

app/assets/sass/uswds/_legacy-styles.scss

@@ -48,8 +48,8 @@
   }
 }
 
-.sms-message-sender, .sms-message-file-name, .sms-message-scheduler, .sms-message-template {
-  margin: units(1) 0 units(1);
+.sms-message-sender, .sms-message-file-name, .sms-message-scheduler, .sms-message-template, .sms-message-sender {
+  margin:0.25rem 0 0;
 }
 
 .sms-message-recipient {

app/main/views/send.py

@@ -39,7 +39,7 @@ from app.utils import PermanentRedirect, should_skip_template_page, unicode_trun
 from app.utils.csv import Spreadsheet, get_errors_for_csv
 from app.utils.templates import get_template
 from app.utils.user import user_has_permissions
-
+from pprint import pprint
 
 def get_example_csv_fields(column_headers, use_example_as_example, submitted_fields):
     if use_example_as_example:
@@ -574,6 +574,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row):
             service_id, template.id, db_template["version"], original_file_name
         ),
         template_id=template_id,
+        db_template=db_template
     )
 
 
@@ -617,6 +618,7 @@ def check_messages(service_id, template_id, upload_id, row_index=2):
         metadata_kwargs["sender_id"] = session["sender_id"]
 
     set_metadata_on_csv_upload(service_id, upload_id, **metadata_kwargs)
+
     return render_template("views/check/ok.html", **data)
 
 
@@ -649,8 +651,14 @@ def preview_job(service_id, template_id, upload_id, row_index=2):
     if data["errors"]:
         return render_template("views/check/column-errors.html", **data)
 
+    simplifed_template = get_template(
+        data.get('db_template', {}),
+        current_service,
+    )
+
     return render_template(
-        "views/check/preview.html", scheduled_for=session["scheduled_for"], **data
+        "views/check/preview.html", scheduled_for=session["scheduled_for"], **data,
+        simplifed_template=simplifed_template
     )
 
 
@@ -857,6 +865,7 @@ def _check_notification(service_id, template_id, exception=None):
         back_link=back_link,
         back_link_from_preview=back_link_from_preview,
         choose_time_form=choose_time_form,
+        db_template=db_template,
         **(get_template_error_dict(exception) if exception else {}),
     )
 
@@ -904,11 +913,20 @@ def preview_notification(service_id, template_id):
         )
 
     session["scheduled_for"] = request.args.get("scheduled_for", "")
+    data = _check_notification(service_id, template_id)
+    db_template = data.get('db_template', None)
+
+    simplifed_template = get_template(
+        db_template,
+        current_service,
+    )
 
     return render_template(
         "views/notifications/preview.html",
-        **_check_notification(service_id, template_id),
+        **data,
         scheduled_for=session["scheduled_for"],
+        simplifed_template=simplifed_template,
+        recipient=recipient,
     )
 
 

app/templates/views/check/preview.html

@@ -20,12 +20,15 @@
 {% block maincolumn_content %}
 
   {{ page_header('Preview') }}
+  <div>
+    <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>
+    <p class="sms-message-sender" >From: {{ template.sender }}</p>
+  </div>
+
   <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-file-name">File: {{original_file_name}}</p>
-  <p class="sms-message-template">Template: {{template.name}}</p>
-  {{ template|string }}
+  <div class="preview-message"> {{ simplifed_template|string }}</div>
   <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() }}" />
@@ -63,10 +66,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 message parts</b>, leaving Washington DSHS with <b>249,200 message parts remaining</b>.</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 %}
-        {{ "Scheduled" if scheduled_for else 'Send'}}
+        {{ "Schedule" if scheduled_for else 'Send'}}
       {% endset %}
       {{ usaButton({ "text": button_text }) }}
 

app/templates/views/notifications/preview.html

@@ -5,7 +5,7 @@
 {% from "components/components/button/macro.njk" import usaButton %}
 
 {% block service_page_title %}
-  {{ "Error" if error else "Preview of ‘{}’".format(template.name) }}
+  {{ "Error" if error else "Preview" }}
 {% endblock %}
 
 {% block backLink %}
@@ -42,12 +42,15 @@
   {% else %}
     {{ page_header('Preview') }}
   {% endif %}
-  <h2 id="{{ file_contents_header_id }}">Message</h2>
+  <div>
+    <p class="sms-message-scheduler">Scheduled: {{ scheduled_for if scheduled_for else 'Now'}}</p>
+    <p class="sms-message-template">Template: {{template.name}}</p>
+    <p class="sms-message-sender" >From: {{ template.sender }}</p>
+    <p class="sms-message-sender" >To: {{ recipient }}</p>
+  </div>
 
-  <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 }}
+  <h2 id="{{ file_contents_header_id }}">Message</h2>
+  <div class="preview-message"> {{ simplifed_template|string }}</div>
 
   <div class="js-stick-at-bottom-when-scrolling">
     <form method="post" enctype="multipart/form-data" action="{{url_for(
@@ -61,7 +64,7 @@
       <h3>Does everything look good?</h3>
       {% if not error %}
         {% set button_text %}
-          {{ "Scheduled" if scheduled_for else 'Send'}}
+          {{ "Schedule" if scheduled_for else 'Send'}}
         {% endset %}
         {{ usaButton({ "text": button_text }) }}
       {% endif %}