Merge pull request #1887 from alphagov/two-step-go-live

Split request to go live into two pages

app/main/views/service_settings.py

@@ -158,10 +158,17 @@ def service_name_change_confirm(service_id):
         form=form)
 
 
-@main.route("/services/<service_id>/service-settings/request-to-go-live", methods=['GET', 'POST'])
+@main.route("/services/<service_id>/service-settings/request-to-go-live")
 @login_required
 @user_has_permissions('manage_settings', admin_override=True)
-def service_request_to_go_live(service_id):
+def request_to_go_live(service_id):
+    return render_template('views/service-settings/request-to-go-live.html')
+
+
+@main.route("/services/<service_id>/service-settings/submit-request-to-go-live", methods=['GET', 'POST'])
+@login_required
+@user_has_permissions('manage_settings', admin_override=True)
+def submit_request_to_go_live(service_id):
     form = RequestToGoLiveForm()
 
     if form.validate_on_submit():
@@ -204,7 +211,7 @@ def service_request_to_go_live(service_id):
         flash('We’ve received your request to go live', 'default')
         return redirect(url_for('.service_settings', service_id=service_id))
 
-    return render_template('views/service-settings/request-to-go-live.html', form=form)
+    return render_template('views/service-settings/submit-request-to-go-live.html', form=form)
 
 
 @main.route("/services/<service_id>/service-settings/switch-live")

app/templates/views/service-settings.html

@@ -228,7 +228,7 @@
 
       <p>
         To remove these restrictions
-        <a href="{{ url_for('.service_request_to_go_live', service_id=current_service.id) }}">request to go live</a>.
+        <a href="{{ url_for('.request_to_go_live', service_id=current_service.id) }}">request to go live</a>.
       </p>
     {% else %}
       <h2 class="heading-medium">Your service is live</h2>

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

@@ -10,55 +10,34 @@
 {% endblock %}
 
 {% block maincolumn_content %}
-
+  <div class="grid-row">
+    <div class="column-five-sixths">
       <h1 class="heading-large">Request to go live</h1>
-
       <p>
         Before you request to go live, make sure you’ve:
       </p>
       <ul class="list list-bullet bottom-gutter">
-        <li>read our <a href="{{ url_for('.terms') }}">terms of use</a></li>
-        <li>added <a href="{{ url_for('main.manage_users', service_id=current_service.id) }}">team members</a> to your account</li>
+        <li>
+          read our <a href="{{ url_for('.terms') }}">terms of use</a>
+        </li>
+        <li>
+          added <a href="{{ url_for('main.manage_users', service_id=current_service.id) }}">team members</a> to your account
+        </li>
         <li>
           specified your reply to email address or text message sender in your
-          <a href="{{ url_for('main.service_settings', service_id=current_service.id) }}">settings</a> page</li>
+          <a href="{{ url_for('main.service_settings', service_id=current_service.id) }}">settings</a> page
+        </li>
         <li>
-          added the templates you want to start with, making sure they 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>
+          added the templates you want to start with, making sure they 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>
-
-      <form method="post">
-        <div class="form-group">
-          <p>We need permission to process your data before we can make your service live.</p>
-          {{ radios(form.mou, option_hints={
-            'no': 'We’ll send you a copy',
-            'don’t know': 'We’ll check for you',
-          }) }}
-        </div>
-        {{ checkbox_group('What kind of messages will you be sending?', [
-          form.channel_email,
-          form.channel_sms,
-          form.channel_letter
-        ]) }}
-        <div class="form-group">
-          {{ textbox(form.start_date, width='1-1') }}
-          {{ textbox(form.start_volume, width='1-1', hint='For example, ‘1,000 per month’.') }}
-          {{ textbox(form.peak_volume, width='1-1', hint='For example, ‘Messages will increase to 20,000 per month in January’.') }}
-        </div>
-        {{ checkbox_group('How are you going to send messages?', [
-          form.method_one_off,
-          form.method_upload,
-          form.method_api
-        ]) }}
-        <p>
-          Once you’ve completed the tasks needed to set up, we’ll make your service live. We’ll do this within one working day.
-        </p>
-        <p>
-          By requesting to go live you’re agreeing to our <a href="{{ url_for('.terms') }}">terms of use</a>.
-        </p>
-
-        {{ page_footer('Request to go live') }}
-      </form>
-
-
+      <p>
+        Once you’ve made the request, we’ll put 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>
+      </p>
+    </div>
+  </div>
 {% endblock %}

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

@@ -0,0 +1,47 @@
+{% extends "withnav_template.html" %}
+{% from "components/checkbox.html" import checkbox_group %}
+{% from "components/textbox.html" import textbox %}
+{% from "components/radios.html" import radios %}
+{% from "components/page-footer.html" import page_footer %}
+{% from "components/banner.html" import banner_wrapper %}
+
+{% block service_page_title %}
+  Request to go live
+{% endblock %}
+
+{% block maincolumn_content %}
+
+      <h1 class="heading-large">Request to go live</h1>
+
+      <form method="post">
+        <div class="form-group">
+          <p>We need permission to process your data before we can make your service live.</p>
+          {{ radios(form.mou, option_hints={
+            'no': 'We’ll send you a copy',
+            'don’t know': 'We’ll check for you',
+          }) }}
+        </div>
+        {{ checkbox_group('What kind of messages will you be sending?', [
+          form.channel_email,
+          form.channel_sms,
+          form.channel_letter
+        ]) }}
+        <div class="form-group">
+          {{ textbox(form.start_date, width='1-1') }}
+          {{ textbox(form.start_volume, width='1-1', hint='For example, ‘1,000 per month’.') }}
+          {{ textbox(form.peak_volume, width='1-1', hint='For example, ‘Messages will increase to 20,000 per month in January’.') }}
+        </div>
+        {{ checkbox_group('How are you going to send messages?', [
+          form.method_one_off,
+          form.method_upload,
+          form.method_api
+        ]) }}
+        <p>
+          By requesting to go live you’re agreeing to our <a href="{{ url_for('.terms') }}">terms of use</a>.
+        </p>
+
+        {{ page_footer('Request to go live') }}
+      </form>
+
+
+{% endblock %}

app/templates/views/using-notify.html

@@ -25,7 +25,13 @@
     <h2 id="trial-mode" class="heading-medium">Trial mode</h2>
     <p>When you sign up to GOV.UK Notify, you’ll start in trial mode. In trial mode, you can send up to 50 text messages and emails a day. You can only send them to yourself and other people in your team.</p>
     <p>You can’t send letters in trial mode.</p>
-    <p>When you request to go live on Notify, we’ll remove these restrictions.</p>
+    <p>When you
+      {% if current_service and current_service.restricted %}
+        <a href="{{ url_for('main.request_to_go_live', service_id=current_service.id) }}">request to go live</a>
+      {% else %}
+        request to go live
+      {% endif %}
+    on Notify, we’ll remove these restrictions.</p>
 
     <h2 id="messagedeliveryandfailure" class="heading-medium">Sending messages</h2>
     <p>When you send a message, it moves through different states in Notify.</p>