From ae8dd8e8cd9b6b2d9264a2636fd8cc4256db3296 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Thu, 23 Apr 2020 11:08:43 +0100
Subject: [PATCH] Tidy up the platform admin pages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit does two things:
- brings the ‘All organisations’ page back within the platform admin
  part of the site (because it’s hard to find otherwise)
- makes the layouts of all the pages within platform admin a bit closer
  to the service-specific pages in terms of heading sizes, spacing, etc
  so that moving between them doesn’t feel so jumpy
---
 app/navigation.py                             |  2 +-
 app/templates/org_template.html               |  2 +-
 .../views/email-branding/select-branding.html |  2 +-
 .../find-services/find-services-by-name.html  |  2 +-
 .../views/find-users/find-users-by-email.html |  2 +-
 app/templates/views/inbound-sms-admin.html    | 12 +--
 .../select-letter-branding.html               |  2 +-
 app/templates/views/organisations/index.html  | 81 +++++++------------
 .../views/platform-admin/_base_template.html  | 20 +++--
 .../views/platform-admin/clear-cache.html     |  6 +-
 .../views/platform-admin/complaints.html      |  2 +-
 app/templates/views/platform-admin/index.html |  2 +-
 .../views/platform-admin/reports.html         |  2 +-
 .../platform-admin/returned-letters.html      | 16 ++--
 .../views/platform-admin/services.html        |  2 +-
 .../views/platform-admin/splash-page.html     |  2 +-
 app/templates/views/providers/providers.html  |  4 +-
 .../views/organisations/test_organisation.py  |  2 +-
 18 files changed, 68 insertions(+), 95 deletions(-)

diff --git a/app/navigation.py b/app/navigation.py
index 7343559d6..210354599 100644
--- a/app/navigation.py
+++ b/app/navigation.py
@@ -98,6 +98,7 @@ class HeaderNavigation(Navigation):
             'notifications_sent_by_service',
             'performance_platform_xlsx',
             'usage_for_all_services',
+            'organisations',
             'platform_admin',
             'platform_admin_list_complaints',
             'platform_admin_reports',
@@ -235,7 +236,6 @@ class HeaderNavigation(Navigation):
         'organisation_settings',
         'organisation_preview_email_branding',
         'organisation_preview_letter_branding',
-        'organisations',
         'privacy',
         'public_agreement',
         'public_download_agreement',
diff --git a/app/templates/org_template.html b/app/templates/org_template.html
index 2088b05cf..af974f104 100644
--- a/app/templates/org_template.html
+++ b/app/templates/org_template.html
@@ -8,7 +8,7 @@
   <div class="govuk-width-container">
     <div class="navigation-service">
       {% if current_user.platform_admin %}
-        <a href="{{ url_for('.organisations') }}" class="govuk-link govuk-link--no-visited-state navigation-organisation-link">All organisations</a>
+        <a href="{{ url_for('.organisations') }}" class="govuk-link govuk-link--no-visited-state navigation-organisation-link">Organisations</a>
       {% endif %}
       <div class="navigation-service-name govuk-!-font-weight-bold">
         {{ current_org.name }}
diff --git a/app/templates/views/email-branding/select-branding.html b/app/templates/views/email-branding/select-branding.html
index 267e04143..eb6e8e3cc 100644
--- a/app/templates/views/email-branding/select-branding.html
+++ b/app/templates/views/email-branding/select-branding.html
@@ -9,7 +9,7 @@
 
 {% block platform_admin_content %}
 
-  {{ page_header('Email branding') }}
+  <h1 class="heading-medium">Email branding</h1>
   {{ live_search(target_selector='.email-brand', show=True, form=search_form) }}
   <nav>
     {% for brand in email_brandings %}
diff --git a/app/templates/views/find-services/find-services-by-name.html b/app/templates/views/find-services/find-services-by-name.html
index dfe10ee6b..e83211ab9 100644
--- a/app/templates/views/find-services/find-services-by-name.html
+++ b/app/templates/views/find-services/find-services-by-name.html
@@ -9,7 +9,7 @@
 
 {% block platform_admin_content %}
 
-  <h1 class="heading-large">
+  <h1 class="heading-medium">
     Find services by name
   </h1>
 
diff --git a/app/templates/views/find-users/find-users-by-email.html b/app/templates/views/find-users/find-users-by-email.html
index b4e429876..49957d753 100644
--- a/app/templates/views/find-users/find-users-by-email.html
+++ b/app/templates/views/find-users/find-users-by-email.html
@@ -9,7 +9,7 @@
 
 {% block platform_admin_content %}
 
-  <h1 class="heading-large">
+  <h1 class="heading-medium">
     Find users by email
   </h1>
 
diff --git a/app/templates/views/inbound-sms-admin.html b/app/templates/views/inbound-sms-admin.html
index aa347b375..bcfd0d839 100644
--- a/app/templates/views/inbound-sms-admin.html
+++ b/app/templates/views/inbound-sms-admin.html
@@ -20,15 +20,9 @@ Inbound Numbers
 
 {% block platform_admin_content %}
 
-  <div class="govuk-grid-row bottom-gutter">
-    <div class="govuk-grid-column-two-thirds">
-      <h1 class="heading-large">
-        Inbound SMS
-      </h1>
-    </div>
-  </div>
-
-
+  <h1 class="heading-medium">
+    Inbound SMS
+  </h1>
 
   <table class="inbound">
           <col style="width:8%">
diff --git a/app/templates/views/letter-branding/select-letter-branding.html b/app/templates/views/letter-branding/select-letter-branding.html
index 7f40f15f7..7dfa52875 100644
--- a/app/templates/views/letter-branding/select-letter-branding.html
+++ b/app/templates/views/letter-branding/select-letter-branding.html
@@ -9,7 +9,7 @@
 
 {% block platform_admin_content %}
 
-  {{ page_header('Letter branding') }}
+  <h1 class="heading-medium">Letter branding</h1>
   {{ live_search(target_selector='.letter-brand', show=True, form=search_form) }}
   <nav>
     {% for brand in letter_brandings %}
diff --git a/app/templates/views/organisations/index.html b/app/templates/views/organisations/index.html
index 0a1778e1b..2fa9cca34 100644
--- a/app/templates/views/organisations/index.html
+++ b/app/templates/views/organisations/index.html
@@ -1,66 +1,41 @@
-{% extends "withoutnav_template.html" %}
+{% extends "views/platform-admin/_base_template.html" %}
 {% from "components/live-search.html" import live_search %}
 {% from "components/button/macro.njk" import govukButton %}
 
 {% block per_page_title %}
-  All organisations
+  Organisations
 {% endblock %}
 
-{% block beforeContent %}{% endblock %}
+{% block platform_admin_content %}
 
-{% block maincolumn_content %}
+  <h1 class="heading-medium">Organisations</h1>
 
-    <div class="navigation-service">
-      <div class="navigation-service-name govuk-!-font-weight-bold">
-        &nbsp;
-      </div>
-      <a href="{{ url_for('main.choose_account') }}" class="govuk-link govuk-link--no-visited-state navigation-service-switch">Switch service</a>
-    </div>
+  {{ live_search(target_selector='.browse-list-item', show=True, form=search_form, label='Search by name') }}
 
-    <div class="govuk-grid-row top-gutter-2-3">
-      <div class="govuk-grid-column-one-quarter">
-        <h1>
-          All organisations
-        </h1>
-      </div>
-      <div class="govuk-grid-column-three-quarters">
+  <nav class="browse-list">
+    <ul>
+      {% for org in organisations %}
+        <li class="browse-list-item">
+          <a href="{{ url_for('main.organisation_dashboard', org_id=org.id) }}" class="govuk-link govuk-link--no-visited-state">{{ org.name }}</a>
+          <p class="browse-list-hint">
+            {{ org.count_of_live_services }}
+            live service{% if org.count_of_live_services != 1 %}s{% endif %}
+          </p>
+          {% if not org.active %}
+            <span class="table-field-status-default heading-medium">- archived</span>
+          {% endif %}
+        </li>
+      {% endfor %}
+    </ul>
+  </nav>
 
-        {{ live_search(target_selector='.browse-list-item', show=True, form=search_form, label='Search by name') }}
-
-        <nav class="browse-list">
-          <ul>
-            {% for org in organisations %}
-              <li class="browse-list-item">
-                <a href="{{ url_for('main.organisation_dashboard', org_id=org.id) }}" class="govuk-link govuk-link--no-visited-state">{{ org.name }}</a>
-                <p class="browse-list-hint">
-                  {{ org.count_of_live_services }}
-                  live service{% if org.count_of_live_services != 1 %}s{% endif %}
-                </p>
-                {% if not org.active %}
-                  <span class="table-field-status-default heading-medium">- archived</span>
-                {% endif %}
-              </li>
-            {% endfor %}
-          </ul>
-        </nav>
-
-      </div>
-    </div>
-    <div class="js-stick-at-bottom-when-scrolling">
-      <div class="govuk-grid-row">
-        <div class="govuk-grid-column-one-quarter">
-          &nbsp;
-        </div>
-        <div class="govuk-grid-column-three-quarters">
-          {{ govukButton({
-            "element": "a",
-            "text": "New organisation",
-            "href": url_for('main.add_organisation'),
-            "classes": "govuk-button--secondary"
-          }) }}
-        </div>
-      </div>
-    </div>
+  <div class="js-stick-at-bottom-when-scrolling">
+    {{ govukButton({
+      "element": "a",
+      "text": "New organisation",
+      "href": url_for('main.add_organisation'),
+      "classes": "govuk-button--secondary"
+    }) }}
   </div>
 
 {% endblock %}
diff --git a/app/templates/views/platform-admin/_base_template.html b/app/templates/views/platform-admin/_base_template.html
index 0bc34b530..5d5c13743 100644
--- a/app/templates/views/platform-admin/_base_template.html
+++ b/app/templates/views/platform-admin/_base_template.html
@@ -3,18 +3,25 @@
 {% from "components/checkbox.html" import checkbox %}
 {% from "components/page-footer.html" import page_footer %}
 
-{% block maincolumn_content %}
 
+{% block beforeContent %}
+  <div class="navigation-service">
+    <div class="navigation-service-name govuk-!-font-weight-bold">
+      Platform admin
+    </div>
+    <a href="{{ url_for('main.choose_account') }}" class="govuk-link govuk-link--no-visited-state navigation-service-switch">Switch service</a>
+  </div>
+{% endblock %}
+
+{% block content %}
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-one-quarter">
-      <p class="heading-medium">
-        Platform admin
-      </p>
       <nav class="navigation">
           {% for link_text, url in [
           ('Summary', url_for('main.platform_admin')),
           ('Live services', url_for('main.live_services')),
           ('Trial mode services', url_for('main.trial_services')),
+          ('Organisations', url_for('main.organisations')),
           ('Providers', url_for('main.view_providers')),
           ('Reports', url_for('main.platform_admin_reports')),
           ('Email branding', url_for('main.email_branding')),
@@ -22,7 +29,7 @@
           ('Inbound SMS numbers', url_for('main.inbound_sms_admin')),
           ('Find services by name', url_for('main.find_services_by_name')),
           ('Find users by email', url_for('main.find_users_by_email')),
-          ('Email Complaints', url_for('main.platform_admin_list_complaints')),
+          ('Email complaints', url_for('main.platform_admin_list_complaints')),
           ('Returned letters', url_for('main.platform_admin_returned_letters')),
           ('Clear cache', url_for('main.clear_cache')),
         ] %}
@@ -34,7 +41,8 @@
         {% endfor %}
       </nav>
     </div>
-    <div class="govuk-grid-column-three-quarters">
+    <div class="govuk-grid-column-three-quarters column-main">
+      {% include 'flash_messages.html' %}
       {% block platform_admin_content %}{% endblock %}
     </div>
   </div>
diff --git a/app/templates/views/platform-admin/clear-cache.html b/app/templates/views/platform-admin/clear-cache.html
index 5cdc11b0a..b601dff30 100644
--- a/app/templates/views/platform-admin/clear-cache.html
+++ b/app/templates/views/platform-admin/clear-cache.html
@@ -4,13 +4,13 @@
 {% from "components/page-footer.html" import page_footer %}
 
 {% block per_page_title %}
-  Clear Cache
+  Clear cache
 {% endblock %}
 
 {% block platform_admin_content %}
 
-  <h1 class="heading-large">
-    Clear Cache
+  <h1 class="heading-medium">
+    Clear cache
   </h1>
 
   {% call form_wrapper() %}
diff --git a/app/templates/views/platform-admin/complaints.html b/app/templates/views/platform-admin/complaints.html
index a4e08465c..1ab875514 100644
--- a/app/templates/views/platform-admin/complaints.html
+++ b/app/templates/views/platform-admin/complaints.html
@@ -9,7 +9,7 @@
 
 {% block platform_admin_content %}
 
-  <h1 class="heading-large">
+  <h1 class="heading-medium">
     Email complaints
   </h1>
 
diff --git a/app/templates/views/platform-admin/index.html b/app/templates/views/platform-admin/index.html
index 60f591a4c..485d59c21 100644
--- a/app/templates/views/platform-admin/index.html
+++ b/app/templates/views/platform-admin/index.html
@@ -13,7 +13,7 @@
 
 {% block platform_admin_content %}
 
-  <h1 class="heading-large">
+  <h1 class="heading-medium">
     Summary
   </h1>
 
diff --git a/app/templates/views/platform-admin/reports.html b/app/templates/views/platform-admin/reports.html
index c07fd26ad..000ed1580 100644
--- a/app/templates/views/platform-admin/reports.html
+++ b/app/templates/views/platform-admin/reports.html
@@ -6,7 +6,7 @@
 
 {% block platform_admin_content %}
 
-  <h1 class="heading-large">
+  <h1 class="heading-medium">
     Reports
   </h1>
 
diff --git a/app/templates/views/platform-admin/returned-letters.html b/app/templates/views/platform-admin/returned-letters.html
index 12b1df7be..d4a55ce15 100644
--- a/app/templates/views/platform-admin/returned-letters.html
+++ b/app/templates/views/platform-admin/returned-letters.html
@@ -1,6 +1,6 @@
 {% extends "views/platform-admin/_base_template.html" %}
 {% from "components/textbox.html" import textbox %}
-{% from "components/page-footer.html" import page_footer %}
+{% from "components/page-footer.html" import sticky_page_footer %}
 {% from "components/form.html" import form_wrapper %}
 
 {% block per_page_title %}
@@ -9,14 +9,10 @@
 
 {% block platform_admin_content %}
 
-<div class="govuk-grid-row">
-  <div class="govuk-grid-column-two-thirds">
-    <h1 class="heading-large">Submit returned letters</h1>
-    {% call form_wrapper() %}
-      {{ textbox(form.references, width='1-1', rows=8, autosize=True) }}
-      {{ page_footer("Submit") }}
-    {% endcall %}
-  </div>
-</div>
+  <h1 class="heading-medium">Submit returned letters</h1>
+  {% call form_wrapper() %}
+    {{ textbox(form.references, width='1-1', rows=8, autosize=True) }}
+    {{ sticky_page_footer("Submit") }}
+  {% endcall %}
 
 {% endblock %}
diff --git a/app/templates/views/platform-admin/services.html b/app/templates/views/platform-admin/services.html
index e0a7eed18..c9e9fb84a 100644
--- a/app/templates/views/platform-admin/services.html
+++ b/app/templates/views/platform-admin/services.html
@@ -99,7 +99,7 @@
 
 {% block platform_admin_content %}
 
-  <h1 class="heading-large">
+  <h1 class="heading-medium">
     {{ page_title|capitalize }}
   </h1>
 
diff --git a/app/templates/views/platform-admin/splash-page.html b/app/templates/views/platform-admin/splash-page.html
index d048ef002..5e48e4797 100644
--- a/app/templates/views/platform-admin/splash-page.html
+++ b/app/templates/views/platform-admin/splash-page.html
@@ -6,7 +6,7 @@
 
 {% block platform_admin_content %}
 
-  <h1 class="heading-large">
+  <h1 class="heading-medium">
     Summary
   </h1>
 
diff --git a/app/templates/views/providers/providers.html b/app/templates/views/providers/providers.html
index 73f435c75..f5f632f90 100644
--- a/app/templates/views/providers/providers.html
+++ b/app/templates/views/providers/providers.html
@@ -8,7 +8,7 @@ Providers
 
 {% block platform_admin_content %}
 
-  <h1 class="heading-large">Providers</h1>
+  <h1 class="heading-medium">Providers</h1>
 
   <h2 class="heading-medium">SMS</h2>
 
@@ -70,7 +70,7 @@ Providers
 
   {% endcall %}
 
-  <h1 class="heading-large">International SMS Providers</h1>
+  <h1 class="heading-medium">International SMS Providers</h1>
 
   {% call(item, row_number) list_table(
       intl_sms_providers,
diff --git a/tests/app/main/views/organisations/test_organisation.py b/tests/app/main/views/organisations/test_organisation.py
index dae5de6f2..1a2044549 100644
--- a/tests/app/main/views/organisations/test_organisation.py
+++ b/tests/app/main/views/organisations/test_organisation.py
@@ -39,7 +39,7 @@ def test_organisation_page_shows_all_organisations(
 
     assert normalize_spaces(
         page.select_one('h1').text
-    ) == "All organisations"
+    ) == "Organisations"
 
     expected_hints = ('0 live services', '1 live service', '2 live services')