From ee5212941cd35ee0d3e4aade63058344bd404850 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Mon, 3 Jun 2019 13:39:25 +0100
Subject: [PATCH] Add back links to organisation settings pages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

They’re nice.
---
 .../organisation/settings/edit-agreement.html             | 6 +++++-
 .../organisation/settings/edit-crown-status.html          | 6 +++++-
 .../organisations/organisation/settings/edit-domains.html | 6 +++++-
 .../organisation/settings/edit-go-live-notes.html         | 6 +++++-
 .../organisations/organisation/settings/edit-type.html    | 5 ++++-
 .../organisation/settings/set-email-branding.html         | 6 +++++-
 .../organisation/settings/set-letter-branding.html        | 6 +++++-
 .../organisations/organisation/users/invite-org-user.html | 8 +++++---
 8 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/app/templates/views/organisations/organisation/settings/edit-agreement.html b/app/templates/views/organisations/organisation/settings/edit-agreement.html
index 76f587cb9..05fb63c30 100644
--- a/app/templates/views/organisations/organisation/settings/edit-agreement.html
+++ b/app/templates/views/organisations/organisation/settings/edit-agreement.html
@@ -1,5 +1,6 @@
 {% from "components/radios.html" import radios %}
 {% from "components/page-footer.html" import page_footer %}
+{% from "components/page-header.html" import page_header %}
 {% from "components/form.html" import form_wrapper %}
 
 {% extends "org_template.html" %}
@@ -9,7 +10,10 @@
 {% endblock %}
 
 {% block maincolumn_content %}
-  <h1 class="heading-large">Data sharing and financial agreement</h1>
+  {{ page_header(
+    "Data sharing and financial agreement",
+    back_link=url_for('.organisation_settings', org_id=current_org.id)
+  ) }}
   <div class="grid-row">
     <div class="column-five-sixths">
       {% call form_wrapper() %}
diff --git a/app/templates/views/organisations/organisation/settings/edit-crown-status.html b/app/templates/views/organisations/organisation/settings/edit-crown-status.html
index 795cf12c3..b53bb1252 100644
--- a/app/templates/views/organisations/organisation/settings/edit-crown-status.html
+++ b/app/templates/views/organisations/organisation/settings/edit-crown-status.html
@@ -1,5 +1,6 @@
 {% from "components/radios.html" import radios %}
 {% from "components/page-footer.html" import page_footer %}
+{% from "components/page-header.html" import page_header %}
 {% from "components/form.html" import form_wrapper %}
 
 {% extends "org_template.html" %}
@@ -9,7 +10,10 @@
 {% endblock %}
 
 {% block maincolumn_content %}
-  <h1 class="heading-large">Crown organisation</h1>
+  {{ page_header(
+    "Crown organisation",
+    back_link=url_for('.organisation_settings', org_id=current_org.id)
+  ) }}
   <div class="grid-row">
     <div class="column-five-sixths">
       {% call form_wrapper() %}
diff --git a/app/templates/views/organisations/organisation/settings/edit-domains.html b/app/templates/views/organisations/organisation/settings/edit-domains.html
index 295cd417d..7407be3ae 100644
--- a/app/templates/views/organisations/organisation/settings/edit-domains.html
+++ b/app/templates/views/organisations/organisation/settings/edit-domains.html
@@ -1,5 +1,6 @@
 {% from "components/radios.html" import radios %}
 {% from "components/page-footer.html" import page_footer %}
+{% from "components/page-header.html" import page_header %}
 {% from "components/list-entry.html" import list_entry %}
 {% from "components/form.html" import form_wrapper %}
 
@@ -10,7 +11,10 @@
 {% endblock %}
 
 {% block maincolumn_content %}
-  <h1 class="heading-large">Known email domains</h1>
+  {{ page_header(
+    "Known email domains",
+    back_link=url_for('.organisation_settings', org_id=current_org.id)
+  ) }}
   <div class="grid-row">
     <div class="column-five-sixths">
       <p>
diff --git a/app/templates/views/organisations/organisation/settings/edit-go-live-notes.html b/app/templates/views/organisations/organisation/settings/edit-go-live-notes.html
index 67f4143f8..e53e6db0e 100644
--- a/app/templates/views/organisations/organisation/settings/edit-go-live-notes.html
+++ b/app/templates/views/organisations/organisation/settings/edit-go-live-notes.html
@@ -1,5 +1,6 @@
 {% from "components/form.html" import form_wrapper %}
 {% from "components/page-footer.html" import page_footer %}
+{% from "components/page-header.html" import page_header %}
 {% from "components/textbox.html" import textbox %}
 
 {% extends "org_template.html" %}
@@ -9,7 +10,10 @@
 {% endblock %}
 
 {% block maincolumn_content %}
-  <h1 class="heading-large">Edit request to go live notes</h1>
+  {{ page_header(
+    "Edit request to go live notes",
+    back_link=url_for('.organisation_settings', org_id=current_org.id)
+  ) }}
   <div class="grid-row">
     <div class="column-five-sixths">
       <p>
diff --git a/app/templates/views/organisations/organisation/settings/edit-type.html b/app/templates/views/organisations/organisation/settings/edit-type.html
index 46d34cf6f..4ce32d672 100644
--- a/app/templates/views/organisations/organisation/settings/edit-type.html
+++ b/app/templates/views/organisations/organisation/settings/edit-type.html
@@ -10,7 +10,10 @@
 {% endblock %}
 
 {% block maincolumn_content %}
-  {{ page_header("Organisation sector") }}
+  {{ page_header(
+    "Organisation sector",
+    back_link=url_for('.organisation_settings', org_id=current_org.id)
+  ) }}
   {% call form_wrapper() %}
     {{ radios(form.organisation_type) }}
     {{ page_footer('Save') }}
diff --git a/app/templates/views/organisations/organisation/settings/set-email-branding.html b/app/templates/views/organisations/organisation/settings/set-email-branding.html
index 71034e51d..e283cf224 100644
--- a/app/templates/views/organisations/organisation/settings/set-email-branding.html
+++ b/app/templates/views/organisations/organisation/settings/set-email-branding.html
@@ -1,6 +1,7 @@
 {% extends "org_template.html" %}
 {% from "components/radios.html" import radios %}
 {% from "components/page-footer.html" import page_footer %}
+{% from "components/page-header.html" import page_header %}
 {% from "components/live-search.html" import live_search %}
 {% from "components/form.html" import form_wrapper %}
 
@@ -10,7 +11,10 @@
 
 {% block maincolumn_content %}
 
-  <h1 class="heading-large">Default email branding</h1>
+  {{ page_header(
+    "Default email branding",
+    back_link=url_for('.organisation_settings', org_id=current_org.id)
+  ) }}
   {% call form_wrapper(data_kwargs={'preview-type': 'email'}) %}
     <div class="grid-row">
       <div class="column-full preview-pane">
diff --git a/app/templates/views/organisations/organisation/settings/set-letter-branding.html b/app/templates/views/organisations/organisation/settings/set-letter-branding.html
index d8c157798..5fd8d20fe 100644
--- a/app/templates/views/organisations/organisation/settings/set-letter-branding.html
+++ b/app/templates/views/organisations/organisation/settings/set-letter-branding.html
@@ -2,6 +2,7 @@
 {% from "components/radios.html" import radios %}
 {% from "components/live-search.html" import live_search %}
 {% from "components/page-footer.html" import page_footer %}
+{% from "components/page-header.html" import page_header %}
 {% from "components/form.html" import form_wrapper %}
 
 {% block org_page_title %}
@@ -10,7 +11,10 @@
 
 {% block maincolumn_content %}
 
-  <h1 class="heading-large">Default letter branding</h1>
+  {{ page_header(
+    "Default letter branding",
+    back_link=url_for('.organisation_settings', org_id=current_org.id)
+  ) }}
   {% call form_wrapper(data_kwargs={'preview-type': 'letter'}) %}
     <div class="grid-row">
       <div class="column-full preview-pane">
diff --git a/app/templates/views/organisations/organisation/users/invite-org-user.html b/app/templates/views/organisations/organisation/users/invite-org-user.html
index ac54d27d4..14fb4dbe3 100644
--- a/app/templates/views/organisations/organisation/users/invite-org-user.html
+++ b/app/templates/views/organisations/organisation/users/invite-org-user.html
@@ -2,6 +2,7 @@
 
 {% from "components/textbox.html" import textbox %}
 {% from "components/page-footer.html" import page_footer %}
+{% from "components/page-header.html" import page_header %}
 {% from "components/form.html" import form_wrapper %}
 
 {% block service_page_title %}
@@ -10,9 +11,10 @@
 
 {% block maincolumn_content %}
 
-  <h1 class="heading-large">
-    Invite a team member
-  </h1>
+  {{ page_header(
+    "Invite a team member",
+    back_link=url_for('.manage_org_users', org_id=current_org.id)
+  ) }}
   <div class="grid-row">
     {% call form_wrapper(class="column-three-quarters") %}
 	    {{ textbox(form.email_address, width='1-1', safe_error_message=True) }}