Split support into two pages

The kind of communications we’re getting at the moment can broadly be
broken down into:
- problems
- questions and feedback

We will need to triage problems differently, because they could
potentially be urgent/severe/emergency/P1/whatever language we use.
Questions or feedback will never be P1.

Two reasons for making the user categorise their tickets themselves:

- Outside of hours we can’t get someone out of bed in order to decide if
  a ticket is a problem or just feedback

- We can tailor the subsequent pages to whether it’s a problem or
  feedback (eg showing a link to the status page if the user is having
  a problem)

This commit let’s users make the choice with a pair of radio buttons.

It also cleans up a bunch of the tests and parameterizes them so we’re
testing the flow for both ticket types.

app/templates/views/support/index.html

@@ -1,9 +1,9 @@
 {% extends "withoutnav_template.html" %}
-{% from "components/textbox.html" import textbox %}
+{% from "components/radios.html" import radios %}
 {% from "components/page-footer.html" import page_footer %}
 
 {% block page_title %}
-  Feedback – GOV.UK Notify
+  Support – GOV.UK Notify
 {% endblock %}
 
 {% block maincolumn_content %}
@@ -15,12 +15,10 @@
     <div class="grid-row">
       <div class="column-two-thirds">
 
-    <p>
-      <a href="{{ url_for('.feedback') }}">I have a problem or question</a>
-    </p>
-
-    <div class="grid-row">
-      <div class="column-two-thirds">
+        <form method="post" class="bottom-gutter-2">
+          {{ radios(form.support_type) }}
+          {{ page_footer('Next') }}
+        </form>
 
         <h2 class="heading-medium">
           Support process
@@ -82,5 +80,4 @@
       </div>
     </div>
 
-
 {% endblock %}

app/templates/views/support/problem.html

@@ -3,19 +3,19 @@
 {% from "components/page-footer.html" import page_footer %}
 
 {% block page_title %}
-  Feedback – GOV.UK Notify
+  Report a problem – GOV.UK Notify
 {% endblock %}
 
 {% block maincolumn_content %}
 
     <h1 class="heading-large">
-      Support and feedback
+      Report a problem
     </h1>
     <div class="grid-row">
       <div class="column-two-thirds">
         <div class="panel panel-border-wide">
           <p>
-            Check our <a href="https://status.notifications.service.gov.uk">system status</a> 
+            Check our <a href="https://status.notifications.service.gov.uk">system status</a>
             page to see if there are any known issues with GOV.UK Notify.
           </p>
         </div>
@@ -26,7 +26,11 @@
             <p>Leave your details below if you'd like a response.</p>
             {{ textbox(form.name, width='1-1') }}
             {{ textbox(form.email_address, width='1-1') }}
-            {{ page_footer('Send') }}  
+            {{ page_footer(
+              'Send',
+              secondary_link=url_for('.support'),
+              secondary_link_text='Back to support',
+            ) }}
         </form>
       </div>
     </div>

app/templates/views/support/question.html

@@ -0,0 +1,31 @@
+{% extends "withoutnav_template.html" %}
+{% from "components/textbox.html" import textbox %}
+{% from "components/page-footer.html" import page_footer %}
+
+{% block page_title %}
+  Ask a question or give feedback – GOV.UK Notify
+{% endblock %}
+
+{% block maincolumn_content %}
+
+    <h1 class="heading-large">
+      Ask a question or give feedback
+    </h1>
+    <div class="grid-row">
+      <div class="column-two-thirds">
+        <form method="post">
+            {{ textbox(form.feedback, width='1-1', hint='', rows=10) }}
+            <h3 class="heading-medium">Do you want a reply?</h3>
+            <p>Leave your details below if you'd like a response.</p>
+            {{ textbox(form.name, width='1-1') }}
+            {{ textbox(form.email_address, width='1-1') }}
+            {{ page_footer(
+              'Send',
+              secondary_link=url_for('.support'),
+              secondary_link_text='Back to support',
+            ) }}
+        </form>
+      </div>
+    </div>
+
+{% endblock %}

app/templates/views/terms-of-use.html

@@ -18,7 +18,7 @@ Terms of use – GOV.UK Notify
         <h2 class="heading-medium">You must accept the GOV.UK Notify data sharing and financial agreement (Memorandum of Understanding) before we can process data for you.</h2>
 
         <p>
-          <a href="{{ url_for('main.feedback') }}">Contact the Notify team</a> to get a copy of the agreement or to find out if your organisation has already accepted it.
+          <a href="{{ url_for('main.support') }}">Contact the Notify team</a> to get a copy of the agreement or to find out if your organisation has already accepted it.
         </p>
 
     {% endcall %}
@@ -83,7 +83,7 @@ Terms of use – GOV.UK Notify
 
       <p>Cabinet Office act as data processor, as parent organisation of GOV.UK Notify. Your organisation remains the data controller.</p>
 
-      <p><a href="{{ url_for('main.feedback') }}">Contact us</a> if you want more information about our approach to data protection and information risk management.</p>
+      <p><a href="{{ url_for('main.support') }}">Contact us</a> if you want more information about our approach to data protection and information risk management.</p>
 
       <h3 class="heading-small" id="we-agree-to-give-you-one-months-notice">
         We agree to give you one months’ notice if we change these terms
@@ -167,7 +167,7 @@ Terms of use – GOV.UK Notify
         Leaving GOV.UK Notify
       </h2>
 
-      <p>You can remove your service from GOV.UK Notify at any time. <a href="{{ url_for('main.feedback') }}">Contact us</a> and we’ll delete your account.</p>
+      <p>You can remove your service from GOV.UK Notify at any time. <a href="{{ url_for('main.support') }}">Contact us</a> and we’ll delete your account.</p>
 
       <p>Any data that you have already processed through GOV.UK Notify will be deleted as part of the existing data deletion processes and data retention periods.</p>