From 2c3c802d5c0eca735c40138edde90e50638e15c4 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Fri, 18 Mar 2016 16:25:43 +0000
Subject: [PATCH] Move documentation into footer, not behind login

https://www.pivotaltracker.com/story/show/115775183
---
 app/assets/stylesheets/app.scss        | 20 ++++++++++++++++++++
 app/main/views/api_keys.py             |  7 +++----
 app/templates/admin_template.html      | 25 +++++++++++++++++++++++--
 app/templates/main_nav.html            |  1 -
 app/templates/views/documentation.html | 12 ++++--------
 tests/app/main/views/test_dashboard.py |  4 +---
 6 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/app/assets/stylesheets/app.scss b/app/assets/stylesheets/app.scss
index d2d7fb838..f1f9c8fc7 100644
--- a/app/assets/stylesheets/app.scss
+++ b/app/assets/stylesheets/app.scss
@@ -88,3 +88,23 @@ td {
 .heading-xlarge {
   margin-bottom: 20px;
 }
+
+#footer {
+
+  .footer-categories {
+    
+    @extend %site-width-container;
+
+    &-wrapper {
+      padding: 0 0 $gutter * 2;
+      margin: 0 0 $gutter;
+      border-bottom: 1px solid $border-colour;
+    }
+
+    h2 {
+      margin: 0 0 $gutter-two-thirds;
+    }
+
+  }
+
+}
\ No newline at end of file
diff --git a/app/main/views/api_keys.py b/app/main/views/api_keys.py
index 8053e2cf9..0ee7b2220 100644
--- a/app/main/views/api_keys.py
+++ b/app/main/views/api_keys.py
@@ -6,10 +6,9 @@ from app import api_key_api_client
 from app.utils import user_has_permissions
 
 
-@main.route("/services/<service_id>/documentation")
-@login_required
-def documentation(service_id):
-    return render_template('views/documentation.html', service_id=service_id)
+@main.route("/documentation")
+def documentation():
+    return render_template('views/documentation.html')
 
 
 @main.route("/services/<service_id>/api-keys")
diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html
index 8b773ce7c..7f2efc0b0 100644
--- a/app/templates/admin_template.html
+++ b/app/templates/admin_template.html
@@ -72,10 +72,31 @@
   </div>
 {% endblock %}
 
+{% block footer_top %}
+  <div class="footer-categories">
+    <div class="footer-categories-wrapper">
+      <div class="grid-row">
+        <div class="column-one-third">
+          <h2>Contact</h2>
+          <ul>
+            <li><a href="https://docs.google.com/forms/d/1AL8U-xJX_HAFEiQiJszGQw0PcEaEUnYATSntEghNDGo/viewform">Support and feedback</a></li>
+          </ul>
+        </div>
+        <div class="column-one-third">
+          <h2>About</h2>
+          <a href="{{ url_for("main.help") }}">Help</a>
+        </div>
+        <div class="column-one-third">
+          <h2>Developers</h2>
+          <a href="{{ url_for('main.documentation') }}">API documentation</a>
+        </div>
+      </div>
+    </div>
+  </div>
+{% endblock %}
+
 {% block footer_support_links %}
   <nav class="footer-nav">
-    <a href="{{ url_for("main.help") }}">Help</a>
-    <a href="https://docs.google.com/forms/d/1AL8U-xJX_HAFEiQiJszGQw0PcEaEUnYATSntEghNDGo/viewform">Support and feedback</a>
     <a href="{{ url_for("main.cookies") }}">Cookies</a>
     Built by the <a href="https://www.gov.uk/government/organisations/government-digital-service">Government Digital Service</a>
   </nav>
diff --git a/app/templates/main_nav.html b/app/templates/main_nav.html
index 24a466958..03b0e87fc 100644
--- a/app/templates/main_nav.html
+++ b/app/templates/main_nav.html
@@ -22,7 +22,6 @@
   {% if current_user.has_permissions(['manage_api_keys', 'access_developer_docs']) %}
   <ul>
     <li><a href="{{ url_for('.api_keys', service_id=service_id) }}">API keys</a></li>
-    <li><a href="{{ url_for('.documentation', service_id=service_id) }}">Developer documentation</a></li>
   </ul>
   {% endif %}
   <ul>
diff --git a/app/templates/views/documentation.html b/app/templates/views/documentation.html
index 073d94e33..13e6943a0 100644
--- a/app/templates/views/documentation.html
+++ b/app/templates/views/documentation.html
@@ -1,15 +1,15 @@
-{% extends "withnav_template.html" %}
+{% extends "withoutnav_template.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/api-key.html" import api_key %}
 
 {% block page_title %}
-  Developer documentation – GOV.UK Notify
+  API documentation – GOV.UK Notify
 {% endblock %}
 
 {% block maincolumn_content %}
 
 <h1 class="heading-large">
-    Set up API integration
+    Developer documentation
 </h1>
 
 <div class="grid-row">
@@ -81,7 +81,7 @@
         {{
           """
 {
-  'to': '+441234123123',
+  'to': '+447700900404',
   'template': 1
 }
           """|syntax_highlight_json
@@ -164,10 +164,6 @@
             https://api.notify.works
         </p>
 
-        <p>
-            <a href="{{ url_for('.api_keys', service_id=service_id) }}">API keys for your service</a>
-        </p>
-
     </div>
 </div>
 
diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py
index 75074aa86..9fc3df630 100644
--- a/tests/app/main/views/test_dashboard.py
+++ b/tests/app/main/views/test_dashboard.py
@@ -62,7 +62,6 @@ def test_menu_send_messages(mocker, app_, api_user_active, service_one, mock_get
         assert url_for('main.service_settings', service_id=service_one['id']) not in page
 
         assert url_for('main.api_keys', service_id=service_one['id']) not in page
-        assert url_for('main.documentation', service_id=service_one['id']) not in page
 
 
 def test_menu_manage_service(mocker, app_, api_user_active, service_one, mock_get_service_templates, mock_get_jobs):
@@ -87,7 +86,6 @@ def test_menu_manage_service(mocker, app_, api_user_active, service_one, mock_ge
         assert url_for('main.service_settings', service_id=service_one['id']) in page
 
         assert url_for('main.api_keys', service_id=service_one['id']) not in page
-        assert url_for('main.documentation', service_id=service_one['id']) not in page
 
 
 def test_menu_manage_api_keys(mocker, app_, api_user_active, service_one, mock_get_service_templates, mock_get_jobs):
@@ -112,4 +110,4 @@ def test_menu_manage_api_keys(mocker, app_, api_user_active, service_one, mock_g
         assert url_for('main.service_settings', service_id=service_one['id']) not in page
 
         assert url_for('main.api_keys', service_id=service_one['id']) in page
-        assert url_for('main.documentation', service_id=service_one['id']) in page
+        assert url_for('main.documentation') in page