Merge pull request #1349 from GSA/810-hide-personalization-after-sending

810 hide personalization after sending

app/templates/views/security.html

@@ -66,7 +66,7 @@
   <p>Some messages include sensitive information like security codes or password reset links.</p>
   <p>If you’re sending a message with sensitive information, you can choose to hide those details on the Notify dashboard once the message has been sent. This means that only the message recipient will be able to see that information.</p>
   <img src="{{ asset_url('images/product/security-review-message.png') }}"
-  alt="Screenshot of a test message in review with the link to 'hide personalization after sending' circled.">
+  alt="Screenshot of a test message in review with the link to 'Hide all personalized and conditional content after sending for increased privacy protection' emphasized.">
 
   <h3 class="font-body-lg">Two-factor authentication</h3>
   <p>To sign in to Notify, you’ll need to enter:</p>

app/templates/views/templates/template.html

@@ -14,7 +14,7 @@
   {% if show_redaction_message %}
 
     <div class="bottom-gutter">
-      {% call banner_wrapper(type='dangerous', subhead='Are you sure you want to hide personalization after sending?') %}
+      {% call banner_wrapper(type='dangerous', subhead='Are you sure you want to hide all personalized and conditional content after sending for increased privacy protection?') %}
         <ul class="list list-bullet">
           <li>
             You will not be able to see personalized content in Notify for this template
@@ -56,18 +56,31 @@
           {{ template._template.updated_at|format_delta }}
         </time>
       </h2>
-      <a class="usa-link margin-right-3" href="{{ url_for('.view_template_versions', service_id=current_service.id, template_id=template.id) }}">See previous versions</a>
+      <h3 class="margin-bottom-0">More actions</h3>
-    {% endif %}
+      <ul class="usa-list usa-list--unstyled">
-    {% if current_user.has_permissions('manage_templates') and user_has_template_permission %}
+        <li>
-      {% if not template._template.archived %}
+          <a class="usa-link margin-right-3"
-          <a class="usa-link margin-right-3" href="{{ url_for('.delete_service_template', service_id=current_service.id, template_id=template.id) }}">Delete this template</a>
+          href="{{ url_for('.view_template_versions', service_id=current_service.id, template_id=template.id) }}">See previous
-      {% endif %}
+          versions</a>
-      {% if not template._template.redact_personalisation %}
+        </li>
-          <a class="usa-link" href="{{ url_for('.confirm_redact_template', service_id=current_service.id, template_id=template.id) }}">Hide personalization after sending</a>
+        {% endif %}
-      {% else %}
+        {% if current_user.has_permissions('manage_templates') and user_has_template_permission %}
+        {% if not template._template.archived %}
+        <li>
+          <a class="usa-link margin-right-3"
+          href="{{ url_for('.delete_service_template', service_id=current_service.id, template_id=template.id) }}">Delete this
+          template</a>
+        </li>
+        {% endif %}
+        {% if not template._template.redact_personalisation %}
+        <li>
+          <a class="usa-link" href="{{ url_for('.confirm_redact_template', service_id=current_service.id, template_id=template.id) }}">Hide all personalized and conditional content after sending</a> for increased privacy protection
+        </li>
+        {% else %}
         <p class="hint">Personalization is hidden after sending</p>
       {% endif %}
     {% endif %}
+    </ul>
   </div>
 
   <!--<div class="">

tests/app/main/views/test_templates.py

@@ -1868,7 +1868,8 @@ def test_should_show_message_before_redacting_template(
     )
 
     assert (
-        "Are you sure you want to hide personalization after sending?"
+        "Are you sure you want to hide all personalized and conditional"
+        " content after sending for increased privacy protection?"
     ) in page.select(".banner-dangerous")[0].text
 
     form = page.select(".banner-dangerous form")[0]