From 4503724ad6faf90356a0142bf51a7d0a1b5dab7c Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Mon, 12 Dec 2016 11:18:25 +0000
Subject: [PATCH] Add a support index page
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Our support process is about to get more fully fledged so we’ll need
an index page to route people properly.

We reckon that users will also want to know what the support process is,
so let’s explain it on this page.
---
 app/main/views/feedback.py                    | 11 ++-
 app/templates/admin_template.html             |  4 +-
 app/templates/views/service-settings.html     |  2 +-
 app/templates/views/signedout.html            |  2 +-
 .../views/{ => support}/feedback.html         |  0
 app/templates/views/support/index.html        | 86 +++++++++++++++++++
 tests/app/main/views/test_feedback.py         |  5 ++
 7 files changed, 103 insertions(+), 7 deletions(-)
 rename app/templates/views/{ => support}/feedback.html (100%)
 create mode 100644 app/templates/views/support/index.html

diff --git a/app/main/views/feedback.py b/app/main/views/feedback.py
index 73eae1df0..e481676ad 100644
--- a/app/main/views/feedback.py
+++ b/app/main/views/feedback.py
@@ -4,7 +4,12 @@ from app.main import main
 from app.main.forms import Feedback
 
 
-@main.route('/feedback', methods=['GET', 'POST'])
+@main.route('/support', methods=['GET', 'POST'])
+def support():
+    return render_template('views/support/index.html')
+
+
+@main.route('/support/feedback', methods=['GET', 'POST'])
 def feedback():
     form = Feedback()
     if form.validate_on_submit():
@@ -38,6 +43,6 @@ def feedback():
                 )
             abort(500, "Feedback submission failed")
         flash("Thanks, we’ve received your feedback", 'default_with_tick')
-        return redirect(url_for('.feedback'))
+        return redirect(url_for('.support'))
 
-    return render_template('views/feedback.html', form=form)
+    return render_template('views/support/feedback.html', form=form)
diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html
index f85071468..60ff553fa 100644
--- a/app/templates/admin_template.html
+++ b/app/templates/admin_template.html
@@ -40,7 +40,7 @@
       <a href="#proposition-links" class="js-header-toggle menu">Menu</a>
       <nav id="proposition-menu">
         <ul id="proposition-links">
-          <li><a href="{{ url_for('main.feedback') }}">Support and feedback</a></li>
+          <li><a href="{{ url_for('main.support') }}">Support and feedback</a></li>
           {% if current_user.is_authenticated %}
             <li>
               <a href="{{ url_for('main.user_profile') }}">{{ current_user.name }}</a>
@@ -84,7 +84,7 @@
           <h2>Support</h2>
           <ul>
             <li><a href="https://status.notifications.service.gov.uk">System status</a></li>
-            <li><a href="{{ url_for('main.feedback') }}">Support and feedback</a></li>
+            <li><a href="{{ url_for('main.support') }}">Support and feedback</a></li>
             <li><a href="https://ukgovernmentdigital.slack.com/messages/govuk-notify">Chat with the Notify team</a></li>
           </ul>
         </div>
diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html
index d19efd6bf..6b1c2a401 100644
--- a/app/templates/views/service-settings.html
+++ b/app/templates/views/service-settings.html
@@ -63,7 +63,7 @@
       </p>
       <p>
         Problems or comments?
-        <a href="{{ url_for('main.feedback') }}">Give feedback</a>.
+        <a href="{{ url_for('main.support') }}">Give feedback</a>.
       </p>
 
     {% endif %}
diff --git a/app/templates/views/signedout.html b/app/templates/views/signedout.html
index 5e804894c..c7ebb9934 100644
--- a/app/templates/views/signedout.html
+++ b/app/templates/views/signedout.html
@@ -168,7 +168,7 @@
           and is supported 24 hours a day, 7 days a week.
         </p>
         <p>
-          <a href="{{ url_for('main.feedback') }}">Contact the team</a> if you have a question or want
+          <a href="{{ url_for('main.support') }}">Contact the team</a> if you have a question or want
           to give feedback.
         </p>
       </div>
diff --git a/app/templates/views/feedback.html b/app/templates/views/support/feedback.html
similarity index 100%
rename from app/templates/views/feedback.html
rename to app/templates/views/support/feedback.html
diff --git a/app/templates/views/support/index.html b/app/templates/views/support/index.html
new file mode 100644
index 000000000..cfcf3958f
--- /dev/null
+++ b/app/templates/views/support/index.html
@@ -0,0 +1,86 @@
+{% extends "withoutnav_template.html" %}
+{% from "components/textbox.html" import textbox %}
+{% from "components/page-footer.html" import page_footer %}
+
+{% block page_title %}
+  Feedback – GOV.UK Notify
+{% endblock %}
+
+{% block maincolumn_content %}
+
+    <h1 class="heading-large">
+      Support
+    </h1>
+
+    <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">
+
+        <h2 class="heading-medium">
+          Support process
+        </h2>
+        <p>
+          If you have a problem, first check for known issues on the
+          GOV.UK Notify <a href="https://status.notifications.service.gov.uk">system status page</a>.
+          Subscribe to get alerts on the progress of any listed issue.
+
+        </p>
+
+        <h2 class="heading-small">
+          During office hours
+        </h2>
+        <p>
+          Our office hours are 9.30am to 5.30pm, Monday to Friday.
+        </p>
+        <p>
+          We’ll reply within 30 minutes whether you’re
+          reporting a problem or just asking a question.
+        </p>
+        <p>
+          The team are also available to answer questions on the
+          <a href="https://ukgovernmentdigital.slack.com/messages/govuk-notify">cross-government Slack channel</a>.
+        </p>
+
+        <h2 class="heading-small">
+          Out of hours support
+        </h2>
+        <p>
+          We offer 24 hour online support if you have a GOV.UK Notify
+          account and we’ve made your service live. We have different
+          response times depending on whether the problem you want to
+          report is an emergency.
+        </p>
+        <p>
+          It’s only an emergency if:
+        </p>
+        <ul class="list list-bullet">
+          <li>
+            no one in your team can log in
+          </li>
+          <li>
+            a ‘technical difficulties’ error appears when you try to
+            upload a file
+          </li>
+          <li>
+            a 500 response code appears when you try to send messages
+            using the API
+          </li>
+        </ul>
+        <p>
+          We’ll reply within 30 minutes and give you hourly updates
+          until the problem’s fixed.
+        </p>
+        <p>
+          We’ll reply by the next working day for any other problems.
+        </p>
+      </div>
+    </div>
+
+
+{% endblock %}
diff --git a/tests/app/main/views/test_feedback.py b/tests/app/main/views/test_feedback.py
index fdf758be7..bc78e2ed4 100644
--- a/tests/app/main/views/test_feedback.py
+++ b/tests/app/main/views/test_feedback.py
@@ -19,6 +19,11 @@ def test_logged_in_user_redirects_to_choose_service(app_,
             assert response.location == url_for('main.choose_service', _external=True)
 
 
+def test_get_support_index_page(client):
+    resp = client.get(url_for('main.support'))
+    assert resp.status_code == 200
+
+
 def test_get_feedback_page(app_):
     with app_.test_request_context():
         with app_.test_client() as client: