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/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(
-    'Callbacks',
-    back_link=url_for('main.api_integration', service_id=current_service.id)
-  ) }}
+  {{ page_header('Callbacks') }}
   <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(
-        'Callbacks for delivery receipts',
-        back_link=url_for(back_link, service_id=current_service.id)
-      ) }}
+      {{ page_header('Callbacks for delivery receipts') }}
 
       <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(
-    'Callbacks for received text messages',
-    back_link=url_for('.api_callbacks', service_id=current_service.id)
-  ) }}
+  {{ page_header('Callbacks for received text messages') }}
   <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(
-      'Guest list',
-      back_link=url_for('main.api_integration', service_id=current_service.id)
-    ) }}
+    {{ page_header('Guest list') }}
   {% 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(
-    'API keys',
-    back_link=url_for('main.api_integration', service_id=current_service.id)
-  ) }}
+  {{ page_header('API keys') }}
 
   <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(
-    'Create an API key',
-    back_link=url_for('main.api_keys', service_id=current_service.id)
-  ) }}
+  {{ page_header('Create an API key') }}
 
   {% call form_wrapper() %}
     {{ form.key_name }}