Move back link outside of main where it was used in the page header

The page_header macro includes an optional back link. Since the
page_header is always used inside `<main>`, where the back link should
not be, this stops setting the back link in the page header and instead
sets it in the new `backLink` block.

app/templates/views/agreement/agreement-accept.html

@@ -4,20 +4,22 @@
 {% 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/back-link/macro.njk" import govukBackLink %}
 
 {% block per_page_title %}
   Accept our data sharing and financial agreement
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.service_agreement', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-five-sixths">
 
-    {{ page_header(
+    {{ page_header('Accept our data sharing and financial agreement') }}
-      'Accept our data sharing and financial agreement',
-      back_link=url_for('main.service_agreement', service_id=current_service.id)
-    ) }}
 
     {% call form_wrapper(class='top-gutter') %}
 

app/templates/views/agreement/agreement-confirm.html

@@ -2,20 +2,23 @@
 {% 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/back-link/macro.njk" import govukBackLink %}
 
 {% block per_page_title %}
   Confirm that you accept the agreement
 {% endblock %}
 
+
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.service_accept_agreement', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-five-sixths">
 
-    {{ page_header(
+    {{ page_header('Confirm that you accept the agreement') }}
-      'Confirm that you accept the agreement',
-      back_link=url_for('main.service_accept_agreement', service_id=current_service.id)
-    ) }}
 
     {% call form_wrapper(class='top-gutter') %}
 

app/templates/views/agreement/service-agreement-choose.html

@@ -1,19 +1,21 @@
 {% extends "withnav_template.html" %}
 {% from "components/page-header.html" import page_header %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Accept the data sharing and financial agreement
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.request_to_go_live', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-five-sixths">
 
-    {{ page_header(
+    {{ page_header('Accept the data sharing and financial agreement')}}
-      'Accept the data sharing and financial agreement',
-      back_link=url_for('main.request_to_go_live', service_id=current_service.id)
-    )}}
 
     <p class="govuk-body">
       Before you can use GOV.UK Notify, you need to accept our data sharing and financial agreement.

app/templates/views/agreement/service-agreement-signed.html

@@ -1,19 +1,21 @@
 {% extends "withnav_template.html" %}
 {% from "components/page-header.html" import page_header %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Your organisation has already accepted the agreement
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.request_to_go_live', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-five-sixths">
 
-    {{ page_header(
+    {{ page_header('Your organisation has already accepted the agreement')}}
-      'Your organisation has already accepted the agreement',
-      back_link=url_for('main.request_to_go_live', service_id=current_service.id)
-    )}}
 
     <p class="govuk-body">
       {{ current_service.organisation.name }} has already accepted the GOV.UK

app/templates/views/agreement/service-agreement.html

@@ -1,20 +1,22 @@
 {% extends "withnav_template.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/button/macro.njk" import govukButton %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Accept our data sharing and financial agreement
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.request_to_go_live', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-five-sixths">
 
-    {{ page_header(
+    {{ page_header('Accept our data sharing and financial agreement')}}
-      'Accept our data sharing and financial agreement',
-      back_link=url_for('main.request_to_go_live', service_id=current_service.id)
-    )}}
 
     <p class="govuk-body">
       Before you can use GOV.UK Notify, you need to accept our data sharing and financial agreement.

app/templates/views/api/callbacks.html

@@ -2,17 +2,18 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/table.html" import mapping_table, row, text_field, edit_field, optional_text_field with context %}
-
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Callbacks
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.api_integration', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
-  {{ page_header(
+  {{ page_header('Callbacks') }}
-    'Callbacks',
-    back_link=url_for('main.api_integration', service_id=current_service.id)
-  ) }}
   <div class="bottom-gutter-3-2 dashboard-table body-copy-table">
 		{% call mapping_table(
 	    caption='General',

app/templates/views/api/callbacks/delivery-status-callback.html

@@ -2,19 +2,22 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Callbacks for delivery receipts
 {% endblock %}
 
+
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for(back_link, service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-five-sixths">
 
-      {{ page_header(
+      {{ page_header('Callbacks for delivery receipts') }}
-        'Callbacks for delivery receipts',
-        back_link=url_for(back_link, service_id=current_service.id)
-      ) }}
 
       <p class="govuk-body">
         When you send an email or text message, we can tell you if Notify was able to deliver it.

app/templates/views/api/callbacks/received-text-messages-callback.html

@@ -2,16 +2,18 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Callbacks for received text messages
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.api_callbacks', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
-  {{ page_header(
+  {{ page_header('Callbacks for received text messages') }}
-    'Callbacks for received text messages',
-    back_link=url_for('.api_callbacks', service_id=current_service.id)
-  ) }}
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-five-sixths">
       <p class="govuk-body">

app/templates/views/api/guest-list.html

@@ -5,11 +5,16 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/list-entry.html" import list_entry %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Guest list
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.api_integration', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
   {% if form.email_addresses.errors or form.phone_numbers.errors %}
@@ -32,10 +37,7 @@
       </ul>
     {% endcall %}
   {% else %}
-    {{ page_header(
+    {{ page_header('Guest list') }}
-      'Guest list',
-      back_link=url_for('main.api_integration', service_id=current_service.id)
-    ) }}
   {% endif %}
 
   <p class="govuk-body">

app/templates/views/api/keys.html

@@ -2,17 +2,19 @@
 {% from "components/table.html" import list_table, field, hidden_field_heading %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/button/macro.njk" import govukButton %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   API keys
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.api_integration', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header('API keys') }}
-    'API keys',
-    back_link=url_for('main.api_integration', service_id=current_service.id)
-  ) }}
 
   <div class="body-copy-table">
     {% call(item, row_number) list_table(

app/templates/views/api/keys/create.html

@@ -3,17 +3,19 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/banner.html" import banner_wrapper %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Create an API key
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.api_keys', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header('Create an API key') }}
-    'Create an API key',
-    back_link=url_for('main.api_keys', service_id=current_service.id)
-  ) }}
 
   {% call form_wrapper() %}
     {{ form.key_name }}

app/templates/views/broadcast/areas-with-sub-areas.html

@@ -1,18 +1,19 @@
+{% extends "withnav_template.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/live-search.html" import live_search %}
-
+{% from "components/back-link/macro.njk" import govukBackLink %}
-{% extends "withnav_template.html" %}
 
 {% block service_page_title %}
   {{ page_title }}
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.choose_broadcast_library', service_id=current_service.id, broadcast_message_id=broadcast_message.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header(page_title)}}
-    page_title,
-    back_link=url_for('.choose_broadcast_library', service_id=current_service.id, broadcast_message_id=broadcast_message.id),
-  )}}
 
   {{ live_search(
     target_selector='.file-list-item',

app/templates/views/broadcast/areas.html

@@ -1,20 +1,21 @@
+{% extends "withnav_template.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import sticky_page_footer %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/live-search.html" import live_search %}
-
+{% from "components/back-link/macro.njk" import govukBackLink %}
-{% extends "withnav_template.html" %}
 
 {% block service_page_title %}
   {{ page_title }}
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.choose_broadcast_library', service_id=current_service.id, broadcast_message_id=broadcast_message.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header(page_title)}}
-    page_title,
-    back_link=url_for('.choose_broadcast_library', service_id=current_service.id, broadcast_message_id=broadcast_message.id),
-  )}}
 
   {{ live_search(
       target_selector='.govuk-checkboxes__item',

app/templates/views/broadcast/counties.html

@@ -1,22 +1,22 @@
+{% extends "withnav_template.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/live-search.html" import live_search %}
 {% from "components/page-footer.html" import sticky_page_footer %}
 {% from "components/form.html" import form_wrapper %}
-
+{% from "components/back-link/macro.njk" import govukBackLink %}
-
-
-{% extends "withnav_template.html" %}
 
 {% block service_page_title %}
   {{ page_title }}
 {% endblock %}
 
+
+{% block backLink %}
+  {{ govukBackLink({ "href": back_link }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header(page_title)}}
-    page_title,
-    back_link=back_link,
-  )}}
 
   {% call form_wrapper() %}
 

app/templates/views/broadcast/libraries.html

@@ -1,17 +1,18 @@
-{% from "components/page-header.html" import page_header %}
-
 {% extends "withnav_template.html" %}
+{% from "components/page-header.html" import page_header %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Choose where to send this alert
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for(".preview_broadcast_areas", service_id=current_service.id, broadcast_message_id=broadcast_message.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header("Choose where to send this alert") }}
-    "Choose where to send this alert",
-    back_link=url_for(".preview_broadcast_areas", service_id=current_service.id, broadcast_message_id=broadcast_message.id)
-  ) }}
 
   {% for area in broadcast_message.parent_areas %}
     <a class="govuk-heading-m govuk-link govuk-link--no-visited-state" href="{{ url_for('.choose_broadcast_sub_area', service_id=current_service.id, broadcast_message_id=broadcast_message.id, library_slug=area.library_id, area_slug=area.id) }}">{{ area.name }}</a>

app/templates/views/broadcast/preview-areas.html

@@ -1,9 +1,9 @@
+{% extends "withnav_template.html" %}
 {% from "components/button/macro.njk" import govukButton %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "views/broadcast/macros/area-map.html" import map %}
-
+{% from "components/back-link/macro.njk" import govukBackLink %}
-{% extends "withnav_template.html" %}
 
 {% block service_page_title %}
   Choose where to send this alert
@@ -17,12 +17,13 @@
   {% include "views/broadcast/partials/area-map-javascripts.html" %}
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": back_link }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header("Choose where to send this alert") }}
-    "Choose where to send this alert",
-    back_link=back_link
-  ) }}
 
   {% for area in broadcast_message.areas %}
     {% if loop.first %}

app/templates/views/broadcast/preview-message.html

@@ -1,18 +1,22 @@
+{% extends "withnav_template.html" %}
 {% from "components/button/macro.njk" import govukButton %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/radios.html" import radio_select %}
-
+{% from "components/back-link/macro.njk" import govukBackLink %}
-{% extends "withnav_template.html" %}
 
 {% block service_page_title %}
   Preview message
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.preview_broadcast_areas', service_id=current_service.id, broadcast_message_id=broadcast_message.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header("Preview", back_link=url_for('.preview_broadcast_areas', service_id=current_service.id, broadcast_message_id=broadcast_message.id)) }}
+  {{ page_header("Preview") }}
 
   {{ broadcast_message.template|string }}
 

app/templates/views/broadcast/sub-areas.html

@@ -1,20 +1,22 @@
+{% extends "withnav_template.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import sticky_page_footer %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/live-search.html" import live_search %}
-
+{% from "components/back-link/macro.njk" import govukBackLink %}
-{% extends "withnav_template.html" %}
 
 {% block service_page_title %}
   {{ page_title }}
 {% endblock %}
 
+
+{% block backLink %}
+  {{ govukBackLink({ "href": back_link }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header(page_title)}}
-    page_title,
-    back_link=back_link,
-  )}}
 
   {% call form_wrapper() %}
 

app/templates/views/broadcast/write-new-broadcast.html

@@ -1,20 +1,22 @@
+{% extends "withnav_template.html" %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/textbox.html" import textbox %}
-
+{% from "components/back-link/macro.njk" import govukBackLink %}
-{% extends "withnav_template.html" %}
 
 {% block service_page_title %}
   New alert
 {% endblock %}
 
+
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.new_broadcast', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header('New alert')}}
-    'New alert',
-    back_link=url_for('.new_broadcast', service_id=current_service.id),
-  )}}
 
   {% call form_wrapper() %}
     <div class="govuk-grid-row">

app/templates/views/check/ok.html

@@ -4,6 +4,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/button/macro.njk" import govukButton %}
 {% from "components/skip-link/macro.njk" import govukSkipLink %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% set file_contents_header_id = 'file-preview' %}
 
@@ -11,12 +12,14 @@
   {{ "Preview of {}".format(template.name) }}
 {% endblock %}
 
+
+{% block backLink %}
+  {{ govukBackLink({ "href": back_link }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header('Preview of {}'.format(template.name)) }}
-    'Preview of {}'.format(template.name),
-    back_link=back_link
-  ) }}
 
   {% if letter_too_long %}
     {% call banner_wrapper(type='dangerous') %}

app/templates/views/dashboard/inbox.html

@@ -1,18 +1,20 @@
+{% extends "withnav_template.html" %}
 {% from "components/ajax-block.html" import ajax_block %}
 {% from "components/page-header.html" import page_header %}
-
+{% from "components/back-link/macro.njk" import govukBackLink %}
-{% extends "withnav_template.html" %}
 
 {% block service_page_title %}
   Received text messages
 {% endblock %}
 
+
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.service_dashboard', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header('Received text messages') }}
-    'Received text messages',
-    back_link=url_for('main.service_dashboard', service_id=current_service.id)
-  ) }}
 
   {{ ajax_block(
     partials,

app/templates/views/edit-broadcast-template.html

@@ -3,17 +3,21 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   {{ heading_action }} template
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({
+    "href": url_for('main.view_template', service_id=current_service.id, template_id=template.id) if template else url_for('main.choose_template', service_id=current_service.id, template_folder_id=template_folder_id)
+  }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header('{} template'.format(heading_action)) }}
-    '{} template'.format(heading_action),
-    back_link=url_for('main.view_template', service_id=current_service.id, template_id=template.id) if template else url_for('main.choose_template', service_id=current_service.id, template_folder_id=template_folder_id)
-  ) }}
 
   {% call form_wrapper() %}
     <div class="govuk-grid-row">

app/templates/views/edit-email-template.html

@@ -3,17 +3,21 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import sticky_page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   {{ heading_action }} email template
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({
+    "href": url_for('main.view_template', service_id=current_service.id, template_id=template.id) if template else url_for('main.choose_template', service_id=current_service.id, template_folder_id=template_folder_id)
+  }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-    {{ page_header(
+    {{ page_header('{} email template'.format(heading_action)) }}
-      '{} email template'.format(heading_action),
-      back_link=url_for('main.view_template', service_id=current_service.id, template_id=template.id) if template else url_for('main.choose_template', service_id=current_service.id, template_folder_id=template_folder_id)
-    ) }}
 
     {% call form_wrapper() %}
       <div class="govuk-grid-row">

app/templates/views/edit-letter-template.html

@@ -3,17 +3,21 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import sticky_page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   {{ heading_action }} letter template
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({
+    "href": url_for('main.view_template', service_id=current_service.id, template_id=template.id) if template else url_for('main.choose_template', service_id=current_service.id, template_folder_id=template_folder_id)
+  }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-    {{ page_header(
+    {{ page_header('{} letter template'.format(heading_action)) }}
-      '{} letter template'.format(heading_action),
-      back_link=url_for('main.view_template', service_id=current_service.id, template_id=template.id) if template else url_for('main.choose_template', service_id=current_service.id, template_folder_id=template_folder_id)
-    ) }}
 
     {% call form_wrapper() %}
       <div class="govuk-grid-row">

app/templates/views/edit-sms-template.html

@@ -3,17 +3,21 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   {{ heading_action }} text message template
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({
+    "href": url_for('main.view_template', service_id=current_service.id, template_id=template.id) if template else url_for('main.choose_template', service_id=current_service.id, template_folder_id=template_folder_id)
+  }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-    {{ page_header(
+    {{ page_header('{} text message template'.format(heading_action)) }}
-      '{} text message template'.format(heading_action),
-      back_link=url_for('main.view_template', service_id=current_service.id, template_id=template.id) if template else url_for('main.choose_template', service_id=current_service.id, template_folder_id=template_folder_id)
-    ) }}
 
     {% if current_service.prefix_sms %}
       {% set content_hint = 'Your message will start with your service name' %}

app/templates/views/edit-user-permissions.html

@@ -3,11 +3,16 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/banner.html" import banner %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   {{ user.name or user.email_localpart }}
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.manage_users', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
   {% if delete %}
     {{ banner(
@@ -18,10 +23,7 @@
     ) }}
   {% endif %}
 
-  {{ page_header(
+  {{ page_header(user.name or user.email_localpart) }}
-    user.name or user.email_localpart,
-    back_link=url_for('main.manage_users', service_id=current_service.id)
-  ) }}
 
   <p class="govuk-body">
     {{ user.email_address }}&emsp;

app/templates/views/email-branding/manage-branding.html

@@ -3,17 +3,20 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   {{ '{} email branding'.format('Update' if email_branding else 'Create')}}
 {% endblock %}
 
+
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.email_branding') }) }}
+{% endblock %}
+
 {% block platform_admin_content %}
 
-  {{ page_header(
+  {{ page_header('{} email branding'.format('Update' if email_branding else 'Add')) }}
-    '{} email branding'.format('Update' if email_branding else 'Add'),
-    back_link=url_for('.email_branding')
-  ) }}
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-three-quarters">
       {% if logo %}

app/templates/views/invite-user.html

@@ -2,17 +2,19 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Invite a team member
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.manage_users', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header('Invite {}'.format(user_to_invite.name if user_to_invite else 'a team member')) }}
-    'Invite {}'.format(user_to_invite.name if user_to_invite else 'a team member') ,
-    back_link=url_for('main.manage_users', service_id=current_service.id)
-  ) }}
 
   {% call form_wrapper() %}
 

app/templates/views/jobs/job.html

@@ -3,17 +3,21 @@
 {% from "components/ajax-block.html" import ajax_block %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/page-header.html" import page_header %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   {{ job.original_file_name }}
 {% endblock %}
 
+{% block backLink %}
+  {% if not just_sent %}
+    {{ govukBackLink({ "href": url_for('main.uploads', service_id=current_service.id) }) }}
+  {% endif %}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-    {{ page_header(
+    {{ page_header(job.original_file_name) }}
-      job.original_file_name,
-      back_link=None if just_sent else url_for('main.uploads', service_id=current_service.id)
-    ) }}
 
     {% if just_sent and job.template_type == 'letter' %}
       {{ banner(just_sent_message, type='default', with_tick=True) }}

app/templates/views/letter-branding/manage-letter-branding.html

@@ -3,17 +3,19 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block per_page_title %}
   {{ '{} letter branding'.format('Update' if is_update else 'Create')}}
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.letter_branding') }) }}
+{% endblock %}
+
 {% block platform_admin_content %}
 
-  {{ page_header(
+  {{ page_header('{} letter branding'.format('Update' if is_update else 'Add')) }}
-    '{} letter branding'.format('Update' if is_update else 'Add'),
-    back_link=url_for('main.letter_branding')
-  ) }}
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-three-quarters">
       {% if logo %}

app/templates/views/manage-users/confirm-edit-user-email.html

@@ -2,17 +2,20 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block per_page_title %}
   Confirm change of email address
 {% endblock %}
 
+
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.edit_user_email', service_id=service_id, user_id=user.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-{{ page_header(
+{{ page_header('Confirm change of email address') }}
-  'Confirm change of email address',
-  url_for('.edit_user_email', service_id=service_id, user_id=user.id)
-) }}
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-full">

app/templates/views/manage-users/confirm-edit-user-mobile-number.html

@@ -2,17 +2,19 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block per_page_title %}
   Confirm change of mobile number
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.edit_user_mobile_number', service_id=service_id, user_id=user.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-{{ page_header(
+{{ page_header('Confirm change of mobile number') }}
-  'Confirm change of mobile number',
-  back_link=url_for('.edit_user_mobile_number', service_id=service_id, user_id=user.id)
-) }}
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-full">

app/templates/views/manage-users/edit-user-email.html

@@ -2,17 +2,20 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block per_page_title %}
   Change team member’s email address
 {% endblock %}
 
+
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.edit_user_permissions', service_id=current_service.id, user_id=user.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header('Change team member’s email address') }}
-    'Change team member’s email address',
-    back_link=url_for('main.edit_user_permissions', service_id=current_service.id, user_id=user.id)
-  ) }}
 
   <p class="govuk-body" id="user_name">This will change the email address for {{ user.name }}.</p>
   {% call form_wrapper() %}

app/templates/views/manage-users/edit-user-mobile.html

@@ -2,17 +2,19 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block per_page_title %}
   Change team member’s mobile number
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.edit_user_permissions', service_id=current_service.id, user_id=user.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header('Change team member’s mobile number') }}
-    'Change team member’s mobile number',
-    back_link=url_for('main.edit_user_permissions', service_id=current_service.id, user_id=user.id)
-  ) }}
 
   <p class="govuk-body" id="user_name">This will change the mobile number for {{ user.name }}.</p>
   <div class="govuk-grid-row">

app/templates/views/notifications/check.html

@@ -8,9 +8,12 @@
   {{ "Error" if error else "Preview of ‘{}’".format(template.name) }}
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": back_link }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
   {% if template.template_type == 'letter' and current_service.trial_mode %}
-    {{ govukBackLink({ "href": back_link }) }}
     {% set error = 'trial-mode-letters' %}
     <div class="bottom-gutter">
       {% call banner_wrapper(type='dangerous') %}
@@ -22,7 +25,6 @@
       {% endcall %}
     </div>
   {% elif error == 'not-allowed-to-send-to' %}
-    {{ govukBackLink({ "href": back_link }) }}
     <div class="bottom-gutter">
       {% call banner_wrapper(type='dangerous') %}
         {% with
@@ -36,7 +38,6 @@
       {% endcall %}
     </div>
   {% elif error == 'too-many-messages' %}
-    {{ govukBackLink({ "href": back_link }) }}
     <div class="bottom-gutter">
       {% call banner_wrapper(type='dangerous') %}
         {% include "partials/check/too-many-messages.html" %}
@@ -44,7 +45,6 @@
     </div>
   {% elif error == 'message-too-long' %}
     {# the only row_errors we can get when sending one off messages is that the message is too long #}
-    {{ govukBackLink({ "href": back_link }) }}
     <div class="bottom-gutter">
       {% call banner_wrapper(type='dangerous') %}
         {% include "partials/check/message-too-long.html" %}
@@ -52,17 +52,13 @@
     </div>
   {% elif letter_too_long %}
     {% set error = 'letter-too-long' %}
-    {{ govukBackLink({ "href": back_link }) }}
     <div class="bottom-gutter">
       {% call banner_wrapper(type='dangerous') %}
           {% include "partials/check/letter-too-long.html" %}
       {% endcall %}
     </div>
   {% else %}
-    {{ page_header(
+    {{ page_header('Preview of ‘{}’'.format(template.name)) }}
-      'Preview of ‘{}’'.format(template.name),
-      back_link=back_link
-    ) }}
   {% endif %}
 
   {{ template|string }}

app/templates/views/notifications/notification.html

@@ -3,16 +3,22 @@
 {% from "components/ajax-block.html" import ajax_block %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   {{ 1|message_count_label(template.template_type, suffix='') | capitalize }}
 {% endblock %}
 
+{% block backLink %}
+  {% if back_link %}
+    {{ govukBackLink({ "href": back_link }) }}
+  {% endif %}
+{% endblock %}
+
 {% block maincolumn_content %}
 
     {{ page_header(
-      1|message_count_label(template.template_type, suffix='') | capitalize,
+      1|message_count_label(template.template_type, suffix='') | capitalize
-      back_link=back_link
     ) }}
     <p class="govuk-body">
       {% if is_precompiled_letter %}

app/templates/views/organisations/add-gp-organisation.html

@@ -4,16 +4,18 @@
 {% from "components/radios.html" import radio, conditional_radio_panel %}
 {% from "components/select-input.html" import select_wrapper %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block per_page_title %}
   Accept our data sharing and financial agreement
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.request_to_go_live', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
-  {{ page_header(
+  {{ page_header('Accept our data sharing and financial agreement') }}
-    'Accept our data sharing and financial agreement',
-    back_link=url_for('main.request_to_go_live', service_id=current_service.id)
-  ) }}
   {% call form_wrapper() %}
     {% call select_wrapper(form.same_as_service_name) %}
       {% for option in form.same_as_service_name %}

app/templates/views/organisations/add-nhs-local-organisation.html

@@ -3,6 +3,7 @@
 {% from "components/page-footer.html" import sticky_page_footer %}
 {% from "components/live-search.html" import live_search %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% set page_title = "Accept our data sharing and financial agreement" %}
 
@@ -10,11 +11,12 @@
   {{ page_title }}
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.request_to_go_live', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
-  {{ page_header(
+  {{ page_header(page_title) }}
-    page_title,
-    back_link=url_for('main.request_to_go_live', service_id=current_service.id)
-  ) }}
   {% call form_wrapper() %}
     <p class="govuk-body">
       {{ form.organisations.label.text }}

app/templates/views/organisations/organisation/settings/edit-agreement.html

@@ -1,18 +1,19 @@
+{% extends "org_template.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
-{% extends "org_template.html" %}
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.organisation_settings', org_id=current_org.id) }) }}
+{% endblock %}
 
 {% block org_page_title %}
   Data sharing and financial agreement
 {% endblock %}
 
 {% block maincolumn_content %}
-  {{ page_header(
+  {{ page_header("Data sharing and financial agreement") }}
-    "Data sharing and financial agreement",
-    back_link=url_for('.organisation_settings', org_id=current_org.id)
-  ) }}
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-five-sixths">
       {% call form_wrapper() %}

app/templates/views/organisations/organisation/settings/edit-crown-status.html

@@ -1,18 +1,19 @@
+{% extends "org_template.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/form.html" import form_wrapper %}
-
+{% from "components/back-link/macro.njk" import govukBackLink %}
-{% extends "org_template.html" %}
 
 {% block org_page_title %}
   Crown organisation
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.organisation_settings', org_id=current_org.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
-  {{ page_header(
+  {{ page_header("Crown organisation") }}
-    "Crown organisation",
-    back_link=url_for('.organisation_settings', org_id=current_org.id)
-  ) }}
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-five-sixths">
       {% call form_wrapper() %}

app/templates/views/organisations/organisation/settings/edit-domains.html

@@ -1,19 +1,20 @@
+{% extends "org_template.html" %}
 {% 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 %}
-
+{% from "components/back-link/macro.njk" import govukBackLink %}
-{% extends "org_template.html" %}
 
 {% block org_page_title %}
   Known email domains
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.organisation_settings', org_id=current_org.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
-  {{ page_header(
+  {{ page_header("Known email domains") }}
-    "Known email domains",
-    back_link=url_for('.organisation_settings', org_id=current_org.id)
-  ) }}
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-five-sixths">
       <p class="govuk-body">

app/templates/views/organisations/organisation/settings/edit-go-live-notes.html

@@ -1,19 +1,20 @@
+{% extends "org_template.html" %}
 {% 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 %}
-
+{% from "components/back-link/macro.njk" import govukBackLink %}
-{% extends "org_template.html" %}
 
 {% block org_page_title %}
   Edit request to go live notes
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.organisation_settings', org_id=current_org.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
-  {{ page_header(
+  {{ page_header("Edit request to go live notes") }}
-    "Edit request to go live notes",
-    back_link=url_for('.organisation_settings', org_id=current_org.id)
-  ) }}
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-five-sixths">
       <p class="govuk-body">

app/templates/views/organisations/organisation/settings/edit-name/confirm.html

@@ -2,17 +2,19 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block org_page_title %}
   Confirm organisation name change
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.organisation_settings', org_id=current_org.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header('Confirm organisation name change') }}
-    'Confirm organisation name change',
-    back_link=url_for('.organisation_settings', org_id=current_org.id)
-  ) }}
 
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-three-quarters">

app/templates/views/organisations/organisation/settings/edit-name/index.html

@@ -2,17 +2,19 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block org_page_title %}
   Change organisation name
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.organisation_settings', org_id=current_org.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header('Change organisation name') }}
-    'Change organisation name',
-    back_link=url_for('.organisation_settings', org_id=current_org.id)
-  ) }}
 
   {% call form_wrapper() %}
     {{ form.name }}

app/templates/views/organisations/organisation/settings/edit-organisation-billing-details.html

@@ -1,20 +1,21 @@
+{% extends "org_template.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/textbox.html" import textbox %}
-
+{% from "components/back-link/macro.njk" import govukBackLink %}
-{% extends "org_template.html" %}
 
 {% block org_page_title %}
   Edit organisation billing details
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.organisation_settings', org_id=current_org.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-    {{ page_header(
+    {{ page_header('Edit organisation billing details') }}
-      'Edit organisation billing details',
-      back_link=url_for('.organisation_settings', org_id=current_org.id)
-    ) }}
 
     {% call form_wrapper() %}
       {{ form.billing_contact_names(param_extensions={"classes": "govuk-!-width-full"}) }}

app/templates/views/organisations/organisation/settings/edit-organisation-notes.html

@@ -1,20 +1,21 @@
+{% extends "org_template.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/textbox.html" import textbox %}
-
+{% from "components/back-link/macro.njk" import govukBackLink %}
-{% extends "org_template.html" %}
 
 {% block org_page_title %}
   Edit organisation notes
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.organisation_settings', org_id=current_org.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-    {{ page_header(
+    {{ page_header('Edit organisation notes') }}
-      'Edit organisation notes',
-      back_link=url_for('.organisation_settings', org_id=current_org.id)
-    ) }}
     {% call form_wrapper() %}
     {{ textbox(
       form.notes,

app/templates/views/organisations/organisation/settings/edit-type.html

@@ -1,18 +1,19 @@
+{% extends "org_template.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/form.html" import form_wrapper %}
-
+{% from "components/back-link/macro.njk" import govukBackLink %}
-{% extends "org_template.html" %}
 
 {% block org_page_title %}
   Organisation sector
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.organisation_settings', org_id=current_org.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
-  {{ page_header(
+  {{ page_header("Organisation sector") }}
-    "Organisation sector",
-    back_link=url_for('.organisation_settings', org_id=current_org.id)
-  ) }}
   {% call form_wrapper() %}
     {{ form.organisation_type }}
     {{ page_footer('Save') }}

app/templates/views/organisations/organisation/settings/set-email-branding.html

@@ -3,6 +3,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/live-search.html" import live_search %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% set page_title = "Default email branding" %}
 
@@ -10,12 +11,13 @@
   {{ page_title }}
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.organisation_settings', org_id=current_org.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header(page_title) }}
-    page_title,
-    back_link=url_for('.organisation_settings', org_id=current_org.id)
-  ) }}
   {% call form_wrapper(data_kwargs={'preview-type': 'email'}) %}
     <div class="govuk-grid-row">
       <div class="govuk-grid-column-full preview-pane">

app/templates/views/organisations/organisation/settings/set-letter-branding.html

@@ -3,6 +3,7 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% set page_title = "Default letter branding" %}
 
@@ -10,12 +11,13 @@
   {{ page_title }}
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.organisation_settings', org_id=current_org.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header(page_title) }}
-    page_title,
-    back_link=url_for('.organisation_settings', org_id=current_org.id)
-  ) }}
   {% call form_wrapper(data_kwargs={'preview-type': 'letter'}) %}
     <div class="govuk-grid-row">
       <div class="govuk-grid-column-full preview-pane">

app/templates/views/organisations/organisation/users/invite-org-user.html

@@ -3,17 +3,19 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Invite a team member
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.manage_org_users', org_id=current_org.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header("Invite a team member") }}
-    "Invite a team member",
-    back_link=url_for('.manage_org_users', org_id=current_org.id)
-  ) }}
   {% call form_wrapper() %}
     {{ form.email_address(
       param_extensions={

app/templates/views/organisations/organisation/users/user/index.html

@@ -2,17 +2,19 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   {{ user.name or user.email_localpart }}
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.manage_org_users', org_id=current_org.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header(user.name or user.email_localpart) }}
-    user.name or user.email_localpart,
-    back_link=url_for('.manage_org_users', org_id=current_org.id)
-  ) }}
 
   <p class="govuk-body">
     {{ user.email_address }}

app/templates/views/providers/edit-provider.html

@@ -2,20 +2,22 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block per_page_title %}
 Provider - {{provider.display_name}}
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.view_providers') }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-three-quarters">
 
-        {{ page_header(
+        {{ page_header(provider.display_name) }}
-          provider.display_name,
-          back_link=url_for('.view_providers')
-        ) }}
 
         <p class="govuk-body">Update provider:</p>
 

app/templates/views/providers/provider.html

@@ -2,21 +2,22 @@
 {% from "components/table.html" import list_table, field, text_field, link_field, right_aligned_field_heading, hidden_field_heading %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block per_page_title %}
 Provider versions
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.view_providers') }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
 
-    {{ page_header(
+    {{ page_header(provider_versions[0].display_name) }}
-      provider_versions[0].display_name,
-      back_link=url_for('main.view_providers')
-    ) }}
-
     {% call(item, row_number) list_table(
         provider_versions,
         caption='',

app/templates/views/returned-letter-summary.html

@@ -1,18 +1,21 @@
+{% extends "withnav_template.html" %}
 {% from "components/table.html" import list_table, row_heading %}
 {% from "components/page-header.html" import page_header %}
-{% extends "withnav_template.html" %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Returned letters
 {% endblock %}
 
+
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.service_dashboard', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-five-sixths">
-    {{ page_header(
+    {{ page_header('Returned letters') }}
-      'Returned letters',
-      back_link=url_for('main.service_dashboard', service_id=current_service.id)
-    ) }}
     <p class="govuk-body">
       Reports are published once a month.
     </p>

app/templates/views/returned-letters.html

@@ -1,17 +1,20 @@
+{% extends "withnav_template.html" %}
 {% from "components/table.html" import list_table, field %}
 {% from "components/page-header.html" import page_header %}
-{% extends "withnav_template.html" %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Returned letters for {{ reported_at|format_date_normal }}
 {% endblock %}
 
+
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.returned_letter_summary', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-{{ page_header(
+{{ page_header('Returned letters for {}'.format(reported_at|format_date_normal)) }}
-  'Returned letters for {}'.format(reported_at|format_date_normal),
-  back_link=url_for('main.returned_letter_summary', service_id=current_service.id)
-) }}
 
 <p class="bottom-gutter">
   <a download href="{{ url_for('.returned_letters_report', service_id=current_service.id, reported_at=reported_at) }}" class="govuk-link heading-small">Download this report</a>

app/templates/views/send-contact-list.html

@@ -3,17 +3,19 @@
 {% from "components/list.html" import list_of_placeholders %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/table.html" import list_table, field, right_aligned_field_heading, row_heading %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Choose an emergency contact list
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.send_one_off', service_id=current_service.id, template_id=template.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header('Choose an emergency contact list') }}
-    'Choose an emergency contact list',
-    back_link=url_for('.send_one_off', service_id=current_service.id, template_id=template.id)
-  ) }}
 
   {% if template.placeholders %}
     <div class="govuk-grid-row">

app/templates/views/send-one-off-letter-address.html

@@ -3,17 +3,19 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/textbox.html" import textbox %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   {{ page_title }}
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": back_link }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header(page_title) }}
-    page_title,
-    back_link=back_link
-  ) }}
 
   {% call form_wrapper(
     class='send-one-off-form',

app/templates/views/send-test.html

@@ -2,17 +2,19 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   {{ page_title }}
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": back_link }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header(page_title) }}
-    page_title,
-    back_link=back_link
-  ) }}
 
   {% call form_wrapper(
     class='js-stick-at-top-when-scrolling send-one-off-form' if template.template_type != 'sms' else 'send-one-off-form',

app/templates/views/send.html

@@ -3,17 +3,20 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/file-upload.html" import file_upload %}
 {% from "components/table.html" import list_table, text_field, index_field, index_field_heading %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Upload a list of {{ 999|recipient_count_label(template.template_type) }}
 {% endblock %}
 
+
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.send_one_off', service_id=current_service.id, template_id=template.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header('Upload a list of {}'.format(999|recipient_count_label(template.template_type))) }}
-    'Upload a list of {}'.format(999|recipient_count_label(template.template_type)),
-    back_link=url_for('main.send_one_off', service_id=current_service.id, template_id=template.id)
-  ) }}
 
   <div class="page-footer bottom-gutter">
     {{file_upload(

app/templates/views/service-settings/branding/branding-options.html

@@ -5,17 +5,21 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Change {{ branding_type }} branding
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({
+    "href": url_for('.view_template', service_id=current_service.id, template_id=from_template) if from_template else url_for('.service_settings', service_id=current_service.id)
+  }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header('Change {} branding'.format(branding_type)) }}
-    'Change {} branding'.format(branding_type),
-    back_link=url_for('.view_template', service_id=current_service.id, template_id=from_template) if from_template else url_for('.service_settings', service_id=current_service.id)
-  ) }}
 
   <p class="govuk-body">
     Your {{ branding_type }}s currently have {{ branding_name }} branding.

app/templates/views/service-settings/confirm.html

@@ -2,17 +2,19 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   {{ heading }}
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header(heading) }}
-    heading,
-    back_link=url_for('main.service_settings', service_id=current_service.id)
-  ) }}
 
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-three-quarters">

app/templates/views/service-settings/data-retention/add.html

@@ -2,17 +2,18 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Data retention
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.add_data_retention', service_id=current_service.id) }) }}
+{% endblock %}
 {% block maincolumn_content %}
 
-    {{ page_header(
+    {{ page_header('Set data retention') }}
-      'Set data retention',
-      back_link=url_for('.add_data_retention', service_id=current_service.id)
-    ) }}
 
     {% call form_wrapper() %}
       {{ form.notification_type }}

app/templates/views/service-settings/data-retention/edit.html

@@ -2,17 +2,19 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Data retention
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.edit_data_retention', service_id=current_service.id, data_retention_id=data_retention_id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-    {{ page_header(
+    {{ page_header('Set data retention') }}
-      'Set data retention',
-      back_link=url_for('.edit_data_retention', service_id=current_service.id, data_retention_id=data_retention_id)
-    ) }}
     {% call form_wrapper() %}
       {{ notification_type | capitalize}}
       {{  form.days_of_retention }}

app/templates/views/service-settings/edit-service-billing-details.html

@@ -3,19 +3,21 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-
+{% from "components/back-link/macro.njk" import govukBackLink %}
 {% from "components/textbox.html" import textbox %}
 
 {% block service_page_title %}
   Change billing details
 {% endblock %}
 
+
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header('Change billing details') }}
-    'Change billing details',
-    back_link=url_for('main.service_settings', service_id=current_service.id)
-  ) }}
 
   {% call form_wrapper() %}
     {{ form.billing_contact_names(param_extensions={"classes": "govuk-!-width-full"}) }}

app/templates/views/service-settings/edit-service-notes.html

@@ -3,17 +3,19 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/textbox.html" import textbox %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Edit service notes
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.service_settings', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-    {{ page_header(
+    {{ page_header('Edit service notes') }}
-      'Edit service notes',
-      back_link=url_for('.service_settings', service_id=current_service.id)
-    ) }}
     {% call form_wrapper() %}
     {{ textbox(
       form.notes,

app/templates/views/service-settings/email-reply-to/add.html

@@ -2,17 +2,19 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Add reply-to email address
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.service_email_reply_to', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header('Add reply-to email address') }}
-    'Add reply-to email address',
-    back_link=url_for('main.service_email_reply_to', service_id=current_service.id)
-  ) }}
 
   {% call form_wrapper() %}
     {{ form.email_address(

app/templates/views/service-settings/email-reply-to/edit.html

@@ -3,17 +3,18 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
  Change reply-to email address
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.service_email_reply_to', service_id=current_service.id) }) }}
+{% endblock %}
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header('Change reply-to email address') }}
-    'Change reply-to email address',
-    back_link=url_for('main.service_email_reply_to', service_id=current_service.id)
-  ) }}
   {% call form_wrapper() %}
     {{ form.email_address(
         param_extensions={

app/templates/views/service-settings/email-reply-to/verify.html

@@ -3,21 +3,24 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/ajax-block.html" import ajax_block %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   {{ verb }} email reply-to address
 {% endblock %}
 
-{% block maincolumn_content %}
+{% block backLink %}
   {% if replace %}
     {% set back_link_href = url_for('.service_edit_email_reply_to', service_id=service_id, reply_to_email_id=replace) %}
   {% else %}
     {% set back_link_href = url_for('.service_add_email_reply_to', service_id=service_id) %}
   {% endif %}
-  {{ page_header(
+
-    '{} email reply-to address'.format(verb),
+  {{ govukBackLink({ "href": back_link_href }) }}
-    back_link=back_link_href
+{% endblock %}
-  ) }}
+
+{% block maincolumn_content %}
+  {{ page_header('{} email reply-to address'.format(verb)) }}
   {{ ajax_block(
       partials,
       url_for('main.service_verify_reply_to_address_updates', service_id=service_id, notification_id=notification_id, is_default=is_default, replace=replace),

app/templates/views/service-settings/email_reply_to.html

@@ -3,17 +3,19 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/table.html" import row_group, row, text_field, edit_field, field, boolean_field, list_table with context %}
 {% from "components/button/macro.njk" import govukButton %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Reply-to email addresses
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header('Reply-to email addresses') }}
-    'Reply-to email addresses',
-    back_link=url_for('main.service_settings', service_id=current_service.id)
-  ) }}
 
   <div class="user-list">
     {% if not current_service.email_reply_to_addresses %}

app/templates/views/service-settings/estimate-usage.html

@@ -3,11 +3,16 @@
 {% from "components/form.html" import form_wrapper %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Tell us how many messages you expect to send
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.request_to_go_live', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-full">
@@ -18,10 +23,7 @@
           </h1>
         {% endcall %}
       {% else %}
-        {{ page_header(
+        {{ page_header('Tell us how many messages you expect to send') }}
-          'Tell us how many messages you expect to send',
-          back_link=url_for('main.request_to_go_live', service_id=current_service.id)
-        ) }}
       {% endif %}
       {% call form_wrapper() %}
         <div class="form-group">

app/templates/views/service-settings/letter-contact-details.html

@@ -3,18 +3,20 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/table.html" import row_group, row, text_field, edit_field, field, boolean_field, list_table with context %}
 {% from "components/button/macro.njk" import govukButton %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Sender addresses
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
   <div class="bottom-gutter">
-    {{ page_header(
+    {{ page_header('Sender addresses') }}
-      'Sender addresses',
-      back_link=url_for('main.service_settings', service_id=current_service.id)
-    ) }}
   </div>
   <div class="user-list">
     <div class="user-list-item">

app/templates/views/service-settings/letter-contact/add.html

@@ -3,17 +3,19 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Add a new address
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": back_link }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header('Add a new address') }}
-    'Add a new address',
-    back_link=back_link
-  ) }}
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-full">
       {% call form_wrapper() %}

app/templates/views/service-settings/letter-contact/edit.html

@@ -3,17 +3,21 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Change sender address
 {% endblock %}
 
+{% block backLink %}
+  {% if not request.args.get('from_template') %}
+    {{ govukBackLink({ "href": url_for('.service_letter_contact_details', service_id=current_service.id) }) }}
+  {% endif %}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header('Change sender address') }}
-    'Change sender address',
-    back_link=None if request.args.get('from_template') else url_for('.service_letter_contact_details', service_id=current_service.id)
-  ) }}
   {% call form_wrapper() %}
     {{ textbox(
       form.letter_contact_block,

app/templates/views/service-settings/link-service-to-organisation.html

@@ -3,6 +3,7 @@
 {% from "components/page-footer.html" import sticky_page_footer %}
 {% from "components/live-search.html" import live_search %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% set page_title = "Link service to organisation" %}
 
@@ -10,12 +11,13 @@
   {{ page_title }}
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.service_settings', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header(page_title) }}
-    page_title,
-    back_link=url_for('.service_settings', service_id=current_service.id)
-  ) }}
   {{ live_search(
     target_selector='.govuk-radios__item',
     show=True, form=search_form,

app/templates/views/service-settings/name-local.html

@@ -3,17 +3,18 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Change your service name
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
+{% endblock %}
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header('Change your service name') }}
-    'Change your service name',
-    back_link=url_for('main.service_settings', service_id=current_service.id)
-  ) }}
 
   <p class="govuk-body">Your service name should tell users what the message is about as well as who it’s from. For example:</p>
     <ul class="govuk-list govuk-list--bullet">

app/templates/views/service-settings/name.html

@@ -3,17 +3,20 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Change your service name
 {% endblock %}
 
+
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header('Change your service name') }}
-    'Change your service name',
-    back_link=url_for('main.service_settings', service_id=current_service.id)
-  ) }}
 
   <div class="form-group">
     {% if current_service.prefix_sms %}

app/templates/views/service-settings/request-to-go-live.html

@@ -3,18 +3,20 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/task-list.html" import task_list_wrapper, task_list_item %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Before you request to go live
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-full">
-      {{ page_header(
+      {{ page_header('Before you request to go live') }}
-        'Before you request to go live',
-        back_link=url_for('main.service_settings', service_id=current_service.id)
-      ) }}
       {% call task_list_wrapper() %}
         {{ task_list_item(
           current_service.has_estimated_usage,

app/templates/views/service-settings/send-files-by-email.html

@@ -4,18 +4,20 @@
 {% from "components/radios.html" import radio %}
 {% from "components/select-input.html" import select_wrapper %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Send files by email
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-five-sixths">
-      {{ page_header(
+      {{ page_header('Send files by email') }}
-        'Send files by email',
-        back_link=url_for('main.service_settings', service_id=current_service.id)
-      ) }}
       <p class="govuk-body">
         This is an API-only feature.
       </p>

app/templates/views/service-settings/service-confirm-broadcast-account-type.html

@@ -3,19 +3,21 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Confirm emergency alert settings
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.service_set_broadcast_channel', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-five-sixths">
-      {{ page_header(
+      {{ page_header('Confirm emergency alert settings') }}
-        'Confirm emergency alert settings',
-        back_link=url_for('.service_set_broadcast_channel', service_id=current_service.id)
-      ) }}
       <p class="govuk-body">
         {{ broadcast_service_name_tag(
           form.account_type.service_mode == 'training',

app/templates/views/service-settings/service-set-broadcast-network.html

@@ -10,14 +10,15 @@
   Choose a mobile network
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.service_set_broadcast_channel', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-five-sixths">
-      {{ page_header(
+      {{ page_header('Choose a mobile network') }}
-        'Choose a mobile network',
-        back_link=url_for('.service_set_broadcast_channel', service_id=current_service.id)
-      ) }}
       {% call form_wrapper() %}
         {% call select_wrapper(form.all_networks, hide_legend=True) %}
           {% for option in form.all_networks %}

app/templates/views/service-settings/set-auth-type.html

@@ -1,19 +1,21 @@
 {% extends "withnav_template.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Sign-in method
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-five-sixths">
-      {{ page_header(
+      {{ page_header('Sign-in method') }}
-        'Sign-in method',
-        back_link=url_for('main.service_settings', service_id=current_service.id)
-      ) }}
       {% if 'email_auth' in current_service.permissions %}
         <p class="heading-small bottom-gutter-2-3">
           Email link or text message code

app/templates/views/service-settings/set-email-branding.html

@@ -3,19 +3,21 @@
 {% from "components/page-footer.html" import page_footer, sticky_page_footer %}
 {% from "components/live-search.html" import live_search %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% set page_title = "Set email branding" %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.service_settings', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block service_page_title %}
   {{ page_title }}
 {% endblock %}
 
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header(page_title) }}
-    page_title,
-    back_link=url_for('.service_settings', service_id=current_service.id)
-  ) }}
   {% call form_wrapper(data_kwargs={'preview-type': 'email'}) %}
     <div class="govuk-grid-row">
       <div class="govuk-grid-column-full preview-pane">

app/templates/views/service-settings/set-email.html

@@ -2,19 +2,21 @@
 {% from "components/form.html" import form_wrapper %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Send emails
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-five-sixths">
-      {{ page_header(
+      {{ page_header('Send emails') }}
-        'Send emails',
-        back_link=url_for('main.service_settings', service_id=current_service.id)
-      ) }}
       <p class="govuk-body">
         It’s free to send emails through GOV.UK Notify.
       </p>

app/templates/views/service-settings/set-free-sms-allowance.html

@@ -2,18 +2,20 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Emails
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.service_settings', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
   {% call form_wrapper() %}
-    {{ page_header(
+    {{ page_header('Free text message allowance') }}
-      'Free text message allowance',
-      back_link=url_for('.service_settings', service_id=current_service.id)
-    ) }}
     {{ form.free_sms_allowance }}
     {{ page_footer('Save') }}
   {% endcall %}

app/templates/views/service-settings/set-inbound-number.html

@@ -10,19 +10,19 @@
   {{ page_title }}
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.service_settings', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
   {% if current_service.has_inbound_number or no_available_numbers %}
-    {{ page_header(
+    {{ page_header(page_title) }}
-      page_title,
-      back_link=url_for('.service_settings', service_id=current_service.id)
-    ) }}
   {% endif %}
   {% if current_service.has_inbound_number %}
     <p class="govuk-body"> This service already has an inbound number </p>
   {% elif no_available_numbers %}
     <p class="govuk-body"> No available inbound numbers </p>
   {% else %}
-    {{ govukBackLink({ "href": url_for('.service_settings', service_id=current_service.id) }) }}
     {% call form_wrapper(class="govuk-!-margin-top-3") %}
       {{ form.inbound_number(param_extensions={
         'fieldset': {

app/templates/views/service-settings/set-inbound-sms.html

@@ -1,19 +1,21 @@
 {% extends "withnav_template.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Receive text messages
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-five-sixths">
-      {{ page_header(
+      {{ page_header('Receive text messages') }}
-        'Receive text messages',
-        back_link=url_for('main.service_settings', service_id=current_service.id)
-      ) }}
       {% if 'inbound_sms' in current_service.permissions %}
         <p class="govuk-body">
           Your service can receive text messages sent to {{ current_service.inbound_number }}.

app/templates/views/service-settings/set-international-letters.html

@@ -2,19 +2,21 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Send international letters
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-five-sixths">
-      {{ page_header(
+      {{ page_header('Send international letters') }}
-        'Send international letters',
-        back_link=url_for('main.service_settings', service_id=current_service.id)
-      ) }}
       <p class="govuk-body">
         It costs more to send a letter to an international address.
       </p>

app/templates/views/service-settings/set-international-sms.html

@@ -2,19 +2,21 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Send international text messages
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-five-sixths">
-      {{ page_header(
+      {{ page_header('Send international text messages') }}
-        'Send international text messages',
-        back_link=url_for('main.service_settings', service_id=current_service.id)
-      ) }}
       <p class="govuk-body">
         Messages to international mobile numbers are charged at 1, 2, or
         3 times the cost of messages to UK mobile numbers.</p>

app/templates/views/service-settings/set-letter-branding.html

@@ -3,6 +3,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% set page_title = "Set letter branding" %}
 
@@ -10,12 +11,13 @@
   {{ page_title }}
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.service_settings', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header(page_title) }}
-    page_title,
-    back_link=url_for('.service_settings', service_id=current_service.id)
-  ) }}
   {% call form_wrapper(data_kwargs={'preview-type': 'letter'}) %}
     <div class="govuk-grid-row">
       <div class="govuk-grid-column-full preview-pane">

app/templates/views/service-settings/set-letter.html

@@ -2,19 +2,21 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Send letters
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-five-sixths">
-      {{ page_header(
+      {{ page_header('Send letters') }}
-        'Send letters',
-        back_link=url_for('main.service_settings', service_id=current_service.id)
-      ) }}
       <p class="govuk-body">
         It costs between 39 pence and £1.21 to send a letter using Notify.
       </p>

app/templates/views/service-settings/set-message-limit.html

@@ -2,18 +2,20 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Set daily message limit
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.service_settings', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
   {% call form_wrapper() %}
-    {{ page_header(
+    {{ page_header('Daily message limit') }}
-      'Daily message limit',
-      back_link=url_for('.service_settings', service_id=current_service.id)
-    ) }}
     {{ form.message_limit }}
     {{ page_footer('Save') }}
   {% endcall %}

app/templates/views/service-settings/set-rate-limit.html

@@ -2,18 +2,20 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Set rate limit
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.service_settings', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
   {% call form_wrapper() %}
-    {{ page_header(
+    {{ page_header('Rate limit') }}
-      'Rate limit',
-      back_link=url_for('.service_settings', service_id=current_service.id)
-    ) }}
     {{ form.rate_limit }}
     {{ page_footer('Save') }}
   {% endcall %}

app/templates/views/service-settings/set-sms.html

@@ -2,19 +2,21 @@
 {% from "components/form.html" import form_wrapper %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Send text messages
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-five-sixths">
-      {{ page_header(
+      {{ page_header('Send text messages') }}
-        'Send text messages',
-        back_link=url_for('main.service_settings', service_id=current_service.id)
-      ) }}
       <p class="govuk-body">
         You have a free allowance of
         {{ '{:,}'.format(current_service.free_sms_fragment_limit) }} text messages each

app/templates/views/service-settings/sms-prefix.html

@@ -2,17 +2,19 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Start text messages with service name
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header('Start text messages with service name') }}
-    'Start text messages with service name',
-    back_link=url_for('main.service_settings', service_id=current_service.id)
-  ) }}
 
   {% call form_wrapper() %}
     {{ form.enabled }}

app/templates/views/service-settings/sms-sender/add.html

@@ -2,17 +2,19 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Add text message sender
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.service_sms_senders', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header('Add text message sender') }}
-    'Add text message sender',
-    back_link=url_for('main.service_sms_senders', service_id=current_service.id)
-  ) }}
 
   {% call form_wrapper() %}
     {{ form.sms_sender(param_extensions={

app/templates/views/service-settings/sms-sender/edit.html

@@ -3,17 +3,21 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Change text message sender
 {% endblock %}
 
+{% block backLink %}
+  {% if not request.args.get('from_template') %}
+    {{ govukBackLink({ "href": url_for('.service_sms_senders', service_id=current_service.id) }) }}
+  {% endif %}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header('Change text message sender') }}
-    'Change text message sender',
-    back_link=None if request.args.get('from_template') else url_for('.service_sms_senders', service_id=current_service.id)
-  ) }}
   {% call form_wrapper() %}
     {% if inbound_number %}
       <p class="govuk-body">

app/templates/views/service-settings/sms-senders.html

@@ -3,17 +3,19 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/table.html" import row_group, row, text_field, edit_field, field, boolean_field, list_table with context%}
 {% from "components/button/macro.njk" import govukButton %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Text message senders
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
+  {{ page_header('Text message senders') }}
-    'Text message senders',
-    back_link=url_for('main.service_settings', service_id=current_service.id)
-  ) }}
 
   <div class="user-list">
     {% if not current_service.sms_senders %}

app/templates/views/support/bat-phone.html

@@ -1,17 +1,19 @@
 {% extends "withoutnav_template.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/page-header.html" import page_header %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block per_page_title %}
   Out of hours emergencies
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.support') }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-    {{ page_header(
+    {{ page_header('Out of hours emergencies')}}
-      'Out of hours emergencies',
-      url_for('.support')
-    )}}
     <div class="govuk-grid-row">
       <div class="govuk-grid-column-two-thirds">
         <p class="govuk-body">

app/templates/views/support/form.html

@@ -3,17 +3,19 @@
 {% from "components/page-footer.html" import sticky_page_footer %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block per_page_title %}
   {{ page_title }}
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": back_link }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-    {{ page_header(
+    {{ page_header(page_title) }}
-      page_title,
-      back_link=back_link
-    ) }}
     <div class="govuk-grid-row">
       <div class="govuk-grid-column-two-thirds">
         {% if show_status_page_banner %}

app/templates/views/support/public.html

@@ -1,20 +1,22 @@
 {% extends "withoutnav_template.html" %}
 
 {% from "components/page-header.html" import page_header %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block per_page_title %}
   The GOV.UK Notify service is for people who work in the government
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('.support') }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
 
-    {{ page_header(
+    {{ page_header('The GOV.UK Notify service is for people who work in the government') }}
-      'The GOV.UK Notify service is for people who work in the government',
-      back_link=url_for('.support')
-    ) }}
 
     <p class="govuk-body">
       We cannot give advice to the public. We do not have access to information about you held by government departments.