Merge branch 'master' of github.com:alphagov/notifications-admin into api-keys-flow

Conflicts:
	tests/app/main/views/test_api_keys.py

app/templates/admin_template.html

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

app/templates/components/sms-message.html

@@ -1,4 +1,9 @@
-{% macro sms_message(body, recipient=None, name=None, edit_link=None) %}
+{% macro sms_message(
+  body, recipient=None, name=None, edit_link=None, input_name=None, input_index=None
+) %}
+  {% if input_name %}
+    <label class="sms-message-option" for="{{ input_name }}-{{ input_index }}">
+  {% endif %}
   {% if name %}
     <h3 class="sms-message-name">
       {% if edit_link %}
@@ -8,14 +13,18 @@
       {% endif %}
     </h3>
   {% endif %}
-  <div class="sms-message">
-    <div class="sms-message-wrapper">
-      {{ body|placeholders }}
-    </div>
+  {% if input_name %}
+    <input class="sms-message-picker" type="radio" id="{{ input_name }}-{{ input_index }}" name="{{ input_name }}" />
+  {% endif %}
+  <div class="sms-message-wrapper{% if input_name %}-with-radio{% endif %}">
+    {{ body|placeholders }}
   </div>
   {% if recipient %}
     <p class="sms-message-recipient">
       {{ recipient }}
     </p>
   {% endif %}
+  {% if input_name %}
+    </label>
+  {% endif %}
 {% endmacro %}

app/templates/views/send-sms.html

@@ -10,35 +10,36 @@
 {% block maincolumn_content %}
   <form method="POST" enctype="multipart/form-data">
 
-    <h1 class="heading-xlarge">Send text messages</h1>
+    <div class="grid-row">
+      <div class="column-three-quarters">
 
-    <fieldset class='form-group'>
-      <legend class="heading-medium">1. Choose text message template</legend>
-      {% for template in message_templates %}
-        <label class="block-label" for="template-{{loop.index}}">
-          {{ template.name }}
-          <input type="radio" name="template" id="template-{{loop.index}}" value="{{ template.name }}" />
-        </label>
-      {% endfor %}
-    </fieldset>
+        <h1 class="heading-xlarge">Send text messages</h1>
 
-    <p>
-      or <a href="{{ url_for('.add_service_template', service_id=service_id) }}">create a new template</a>
-    </p>
+        <fieldset class='form-group'>
+          <legend class="heading-medium">1. Choose text message template</legend>
+          {% for template in message_templates %}
+            {{ sms_message(
+              template.body, name=template.name, input_name='template', input_index=loop.index
+            ) }}
+          {% endfor %}
+        </fieldset>
 
-    <h2 class="heading-medium">2. Add recipients</h2>
+        <h2 class="heading-medium">2. Add recipients</h2>
 
-    <p>
-      Upload a CSV file to add your recipients’ details.
-    </p>
-    <p>
-      You can also <a href="#">download an example CSV</a>.
-    </p>
-    <p>
-      {{textbox(form.file)}}
-    </p>
+        <p>
+          Upload a CSV file to add your recipients’ details.
+        </p>
+        <p>
+          You can also <a href="#">download an example CSV</a>.
+        </p>
+        <p>
+          {{textbox(form.file)}}
+        </p>
 
-    {{ page_footer("Continue") }}
+        {{ page_footer("Continue") }}
+
+      </div>
+    </div>
 
   </form>
 

app/templates/views/styleguide.html

@@ -92,7 +92,7 @@
 
   <h2 class="heading-large">SMS message</h2>
 
-  <p>Used to show or preview an SMS message.</p>
+  <p>Used to show, preview or choose an SMS message.</p>
 
   <div class="grid-row">
     <div class="column-half">
@@ -102,6 +102,12 @@
         "Your vehicle tax for registration number is due on date. Renew online at www.gov.uk/vehicle-tax",
         "+44 7700 900 306"
       ) }}
+      {{ sms_message(
+        "Your vehicle tax for ((registration number)) is due on ((date)). Renew online at www.gov.uk/vehicle-tax",
+        name="Reminder",
+        input_name="template",
+        input_index=1
+      ) }}
     </div>
   </div>