From de7701d4071d63e267379aa67217e9ba016a0492 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Mon, 12 Mar 2018 12:29:25 +0000
Subject: [PATCH] Reword request to go live checklist page
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Implements Thom’s suggestions.
---
 .../service-settings/request-to-go-live.html  | 33 ++++++++-----------
 tests/app/main/views/test_service_settings.py | 14 ++++----
 2 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/app/templates/views/service-settings/request-to-go-live.html b/app/templates/views/service-settings/request-to-go-live.html
index 16446d9fb..27c7bb16e 100644
--- a/app/templates/views/service-settings/request-to-go-live.html
+++ b/app/templates/views/service-settings/request-to-go-live.html
@@ -12,46 +12,41 @@
 
 {% block maincolumn_content %}
   <div class="grid-row">
-    <div class="column-five-sixths">
+    <div class="column-whole">
       <h1 class="heading-large">Request to go live</h1>
       <p>
-        Before you request to go live, make sure that:
+        Before your service can go live on Notify, you’ll need to:
       </p>
       <ul class='bottom-gutter'>
         {{ tick_cross_done_not_done(
           has_team_members,
-          'Another person in your team has the ‘Manage service’ permission',
+          'Have more than one <a href="{}">team member</a> with the ‘Manage service’ permission'.format(
+            url_for('main.manage_users', service_id=current_service.id)
+          )|safe,
         ) }}
         {{ tick_cross_done_not_done(
           has_templates,
-          'You’ve added some templates',
+          'Create some <a href="{}">templates</a>'.format(
+            url_for('main.choose_template', service_id=current_service.id)
+          )|safe,
         ) }}
         {% if has_email_templates %}
           {{ tick_cross_done_not_done(
             has_email_reply_to_address,
-            'You’ve added an email reply to address on the <a href="{}">settings</a> page'.format(
-              url_for('main.service_settings', service_id=current_service.id)
+            'Add an <a href="{}">email reply to address</a>'.format(
+              url_for('main.service_email_reply_to', service_id=current_service.id)
             )|safe,
           ) }}
         {% endif %}
       </ul>
       <p>
-        You also need to:
+        You also need to accept our <a href="{{ url_for('.terms') }}">terms of use</a>.
       </p>
-      <ul class="list list-bullet bottom-gutter">
-        <li>
-          read our <a href="{{ url_for('.terms') }}">terms of use</a>
-        </li>
-        <li>
-          make sure your messages follow the GOV.UK Service Manual standards for
-          <a href="https://www.gov.uk/service-manual/design/sending-emails-and-text-messages">writing text messages and emails</a>
-        </li>
-      </ul>
-      <p>
-        Once you’ve made the request, we’ll put your service live within one working day.
+      <p class="bottom-gutter">
+        We’ll make your service live within one working day.
       </p>
       <p>
-        <a href="{{ url_for('main.submit_request_to_go_live', service_id=current_service.id) }}" class="button">Next</a>
+        <a href="{{ url_for('main.submit_request_to_go_live', service_id=current_service.id) }}" class="button">Continue</a>
       </p>
     </div>
   </div>
diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py
index 195918629..1ed068554 100644
--- a/tests/app/main/views/test_service_settings.py
+++ b/tests/app/main/views/test_service_settings.py
@@ -456,19 +456,19 @@ def test_should_raise_duplicate_name_handled(
 
 
 @pytest.mark.parametrize('count_of_users_with_manage_service, expected_user_checklist_item', [
-    (1, 'Not done: Another person in your team has the ‘Manage service’ permission'),
-    (2, 'Done: Another person in your team has the ‘Manage service’ permission'),
+    (1, 'Not done: Have more than one team member with the ‘Manage service’ permission'),
+    (2, 'Done: Have more than one team member with the ‘Manage service’ permission'),
 ])
 @pytest.mark.parametrize('count_of_templates, expected_templates_checklist_item', [
-    (0, 'Not done: You’ve added some templates'),
-    (1, 'Done: You’ve added some templates'),
-    (2, 'Done: You’ve added some templates'),
+    (0, 'Not done: Create some templates'),
+    (1, 'Done: Create some templates'),
+    (2, 'Done: Create some templates'),
 ])
 @pytest.mark.parametrize('count_of_email_templates, reply_to_email_addresses, expected_reply_to_checklist_item', [
     pytest.mark.xfail((0, [], ''), raises=IndexError),
     pytest.mark.xfail((0, [{}], ''), raises=IndexError),
-    (1, [], 'Not done: You’ve added an email reply to address on the settings page'),
-    (1, [{}], 'Done: You’ve added an email reply to address on the settings page'),
+    (1, [], 'Not done: Add an email reply to address'),
+    (1, [{}], 'Done: Add an email reply to address'),
 ])
 def test_should_show_request_to_go_live_checklist(
     client_request,