Update content to work in task list pattern

We probably don't need to use a lead-in for a task list / table.

Also moves the line about making the service live within one day to the
next screen.

app/templates/views/service-settings/request-to-go-live.html

@@ -7,33 +7,32 @@
 {% from "components/task-list.html" import task_list_wrapper, task_list_item %}
 
 {% block service_page_title %}
-  Request to go live
+  Before you request to go live
 {% endblock %}
 
 {% block maincolumn_content %}
   <div class="grid-row">
     <div class="column-whole">
-      <h1 class="heading-large">Request to go live</h1>
+      <h1 class="heading-large">Before you request to go live</h1>
-      <p>
-        Before your service can go live on Notify, you need:
-      </p>
       {% call task_list_wrapper() %}
         {{ task_list_item(
           has_team_members,
-          'More than one <a href="{}">team member</a> with the ‘Manage settings’ permission'.format(
+          'Add a <a href="{}">team member</a> who can manage settings, team and usage
+'.format(
             url_for('main.manage_users', service_id=current_service.id)
           )|safe,
         ) }}
         {{ task_list_item(
           has_templates,
-          '<a href="{}">Templates</a> showing the kind of messages you plan to send'.format(
+          'Add content to
+<a href="{}">templates</a> to show the kind of messages you’ll send'.format(
             url_for('main.choose_template', service_id=current_service.id)
           )|safe,
         ) }}
         {% if has_email_templates %}
           {{ task_list_item(
             has_email_reply_to_address,
-            'An <a href="{}">email reply-to address</a>'.format(
+            'Add an <a href="{}">email reply-to address</a>'.format(
               url_for('main.service_email_reply_to', service_id=current_service.id)
             )|safe,
           ) }}
@@ -41,16 +40,15 @@
         {% if has_sms_templates and shouldnt_use_govuk_as_sms_sender %}
           {{ task_list_item(
             not sms_sender_is_govuk,
-            'Change your text message sender from GOVUK'
+            'Change your <a href="{}">text message sender name</a>'.format(
+              url_for('main.service_sms_senders', service_id=current_service.id)
+            )|safe
           ) }}
         {% endif %}
       {% endcall %}
       <p>
         You also need to accept our <a href="{{ url_for('.terms') }}">terms of use</a>.
       </p>
-      <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">Continue</a>
       </p>

app/templates/views/service-settings/submit-request-to-go-live.html

@@ -6,12 +6,16 @@
 {% from "components/banner.html" import banner_wrapper %}
 
 {% block service_page_title %}
-  How do you plan to use Notify?
+  Request to go live
 {% endblock %}
 
 {% block maincolumn_content %}
 
-      <h1 class="heading-large">How do you plan to use Notify?</h1>
+      <h1 class="heading-large">Request to go live</h1>
+
+      <p class="bottom-gutter">
+        Tell us how you plan to use Notify. When we receive your request we’ll make your service live within one working day.
+      </p>
 
       <form method="post" class="top-gutter">
         {{ checkbox_group('What kind of messages will you be sending?', [

tests/app/main/views/test_service_settings.py

@@ -503,22 +503,19 @@ def test_should_raise_duplicate_name_handled(
 
 
 @pytest.mark.parametrize('count_of_users_with_manage_service, expected_user_checklist_item', [
-    (1, 'More than one team member with the ‘Manage settings’ permission Not completed'),
+    (1, 'Add a team member who can manage settings, team and usage Not completed'),
-    (2, 'More than one team member with the ‘Manage settings’ permission Completed'),
+    (2, 'Add a team member who can manage settings, team and usage Completed'),
 ])
 @pytest.mark.parametrize('count_of_templates, expected_templates_checklist_item', [
-    (0, 'Templates showing the kind of messages you plan to send Not completed'),
+    (0, 'Add content to templates to show the kind of messages you’ll send Not completed'),
-    (1, 'Templates showing the kind of messages you plan to send Completed'),
+    (1, 'Add content to templates to show the kind of messages you’ll send Completed'),
-    (2, 'Templates showing the kind of messages you plan to send Completed'),
+    (2, 'Add content to templates to show the kind of messages you’ll send Completed'),
 ])
 @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, [], 'An email reply-to address Not completed'),
+    (1, [], 'Add an email reply-to address Not completed'),
-    (1, [{}], 'An email reply-to address Completed'),
+    (1, [{}], 'Add an email reply-to address Completed'),
-])
-@pytest.mark.parametrize('expected_sms_sender_item', [
-    ('Templates showing the kind of messages you plan to send Not completed'),
 ])
 def test_should_show_request_to_go_live_checklist(
     client_request,
@@ -531,7 +528,6 @@ def test_should_show_request_to_go_live_checklist(
     count_of_email_templates,
     reply_to_email_addresses,
     expected_reply_to_checklist_item,
-    expected_sms_sender_item,
 ):
 
     def _count_templates(service_id, template_type=None):
@@ -556,7 +552,7 @@ def test_should_show_request_to_go_live_checklist(
     page = client_request.get(
         'main.request_to_go_live', service_id=SERVICE_ONE_ID
     )
-    assert page.h1.text == 'Request to go live'
+    assert page.h1.text == 'Before you request to go live'
 
     checklist_items = page.select('.task-list .task-list-item')
 
@@ -609,13 +605,13 @@ def test_should_show_request_to_go_live_checklist(
         'local',
         1,
         [],
-        'Change your text message sender from GOVUK Not completed',
+        'Change your text message sender name Not completed',
     ),
     (
         'local',
         1,
         [{'is_default': True, 'sms_sender': 'GOVUK'}],
-        'Change your text message sender from GOVUK Not completed',
+        'Change your text message sender name Not completed',
     ),
     (
         'local',
@@ -624,13 +620,13 @@ def test_should_show_request_to_go_live_checklist(
             {'is_default': False, 'sms_sender': 'GOVUK'},
             {'is_default': True, 'sms_sender': 'KUVOG'},
         ],
-        'Change your text message sender from GOVUK Completed',
+        'Change your text message sender name Completed',
     ),
     (
         'nhs',
         1,
         [{'is_default': True, 'sms_sender': 'KUVOG'}],
-        'Change your text message sender from GOVUK Completed',
+        'Change your text message sender name Completed',
     ),
 ])
 def test_should_check_for_sms_sender_on_go_live(
@@ -671,7 +667,7 @@ def test_should_check_for_sms_sender_on_go_live(
     page = client_request.get(
         'main.request_to_go_live', service_id=SERVICE_ONE_ID
     )
-    assert page.h1.text == 'Request to go live'
+    assert page.h1.text == 'Before you request to go live'
 
     checklist_items = page.select('.task-list .task-list-item')
     assert normalize_spaces(checklist_items[2].text) == expected_sms_sender_checklist_item
@@ -691,7 +687,7 @@ def test_should_show_request_to_go_live(
     page = client_request.get(
         'main.submit_request_to_go_live', service_id=SERVICE_ONE_ID
     )
-    assert page.h1.text == 'How do you plan to use Notify?'
+    assert page.h1.text == 'Request to go live'
     for channel, label in (
         ('email', 'Emails'),
         ('sms', 'Text messages'),