Page for adding a new service

This page is exactly the same as the page for adding your first service, save
the heading text.

So all this commit does is:
- set up two routes (`/add-service`, `/add-service/first`) for each of the two
  journeys and change the existing journeys to use the `/add-service/first`
  route
- add logic to show different heading text depending on the journey
- add a link to the new (`/add-service`) route in the service chooser dropdown

app/assets/stylesheets/_grids.scss

@@ -5,3 +5,7 @@
 .column-three-quarters {
   @include grid-column(3/4);
 }
+
+.bottom-gutter {
+  margin-bottom: $gutter;
+}

app/main/forms.py

@@ -161,8 +161,12 @@ class AddServiceForm(Form):
         self.service_names = service_names
         super(AddServiceForm, self).__init__(*args, **kwargs)
 
-    service_name = StringField(validators=[
-        DataRequired(message='Service name can not be empty')])
+    service_name = StringField(
+        'Service name',
+        validators=[
+            DataRequired(message='Service name can not be empty')
+        ]
+    )
 
     def validate_service_name(self, a):
         if self.service_name.data in self.service_names:

app/main/views/add_service.py

@@ -1,4 +1,4 @@
-from flask import render_template, jsonify, redirect, session, url_for
+from flask import request, render_template, jsonify, redirect, session, url_for, abort
 from flask_login import login_required
 from app.main import main
 from app.main.dao import services_dao, users_dao
@@ -6,13 +6,25 @@ from app.main.forms import AddServiceForm
 
 
 @main.route("/add-service", methods=['GET', 'POST'])
+@main.route("/add-service/<string:first>", methods=['GET', 'POST'])
 @login_required
-def add_service():
+def add_service(first=False):
+    if first:
+        if first == 'first':
+            heading = 'Set up notifications for your service'
+        else:
+            abort(404)
+    else:
+        heading = 'Add a new service'
+
     form = AddServiceForm(services_dao.find_all_service_names())
     if form.validate_on_submit():
-
         user = users_dao.get_user_by_id(session['user_id'])
         services_dao.insert_new_service(form.service_name.data, user)
         return redirect(url_for('.dashboard', service_id=123))
     else:
-        return render_template('views/add-service.html', form=form)
+        return render_template(
+            'views/add-service.html',
+            form=form,
+            heading=heading
+        )

app/main/views/verify.py

@@ -20,5 +20,5 @@ def verify():
         verify_codes_dao.use_code_for_user_and_type(user_id=user.id, code_type='sms')
         users_dao.activate_user(user.id)
         login_user(user)
-        return redirect(url_for('.add_service'))
+        return redirect(url_for('.add_service', first='first'))
     return render_template('views/verify.html', form=form)

app/templates/admin_template.html

@@ -56,7 +56,7 @@
               Service name
             </div>
             <a href="#">Switch to A N Other service</a>
-            <a href="#">Add a new service to Notify…</a>
+            <a href="{{ url_for('.add_service') }}">Add a new service to GOV.UK Notify</a>
           </div>
         </div>
         <div class="column-half management-navigation-account">

app/templates/views/add-service.html

@@ -1,5 +1,6 @@
 {% extends "admin_template.html" %}
 {% from "components/textbox.html" import textbox %}
+{% from "components/page-footer.html" import page_footer %}
 
 {% block page_title %}
 GOV.UK Notify | Set up service
@@ -8,24 +9,34 @@ GOV.UK Notify | Set up service
 {% block fullwidth_content %}
 
 <div class="grid-row">
-	<div class="column-two-thirds">
-		<h1 class="heading-xlarge">Set up notifications for your service</h1>
+  <div class="column-two-thirds">
 
-		<p>Users will see your service name:</p>
-			<ul class="list-bullet">
-				<li>at the start of every text message, eg 'Vehicle tax: we received your payment, thank you'</li>
-				<li>as your email sender name</li>
-			</ul>
+    <h1 class="heading-xlarge">
+      {{ heading }}
+    </h1>
 
-		<form autocomplete="off" method="post">
-			{{ textbox(form.service_name) }}
+    <p>
+      Users will see your service name:
+    </p>
 
-			<p>
-			<button class="button" href="dashboard" role="button">Continue</button>
-			</p>
-		</form>
-		</div>
-	</div>
+    <ul class="list-bullet bottom-gutter">
+      <li>
+        at the start of every text message, eg ‘Vehicle tax: we received your
+        payment, thank you’
+      </li>
+      <li>
+        as your email sender name
+      </li>
+    </ul>
+
+    <form autocomplete="off" method="post">
+      {{ textbox(form.service_name) }}
+      {{ page_footer(
+        'Continue'
+      ) }}
+    </form>
+
+  </div>
 </div>
 
 {% endblock %}