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/uploads/choose-file.html

@@ -2,11 +2,18 @@
 {% from "components/banner.html" import banner_wrapper %}
 {% from "components/file-upload.html" import file_upload %}
 {% from "components/page-header.html" import page_header %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Upload a letter
 {% endblock %}
 
+{% block backLink %}
+  {% if not error %}
+    {{ govukBackLink({ "href": url_for('main.uploads', service_id=current_service.id) }) }}
+  {% endif %}
+{% endblock %}
+
 {% block maincolumn_content %}
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-five-sixths">
@@ -18,10 +25,7 @@
         {% endif %}
       {% endcall %}
     {% else %}
-      {{ page_header(
-        'Upload a letter',
-        back_link=url_for('main.uploads', service_id=current_service.id)
-    ) }}
+      {{ page_header('Upload a letter') }}
     <p class="govuk-body">Upload a single letter as a PDF and we’ll print, pack and post it for you.</p>
     <p class="govuk-body">You can use this feature if you send a lot of one-off letters or if our reusable letter templates do not meet your needs.</p>
     {% endif %}

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

@@ -5,17 +5,19 @@
 {% from "components/table.html" import list_table, field, text_field, index_field, hidden_field_heading, row, row_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 %}
   {{ contact_list.original_file_name }}
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.uploads', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
-    contact_list.original_file_name,
-    back_link=url_for('main.uploads', service_id=current_service.id)
-  ) }}
+  {{ page_header(contact_list.original_file_name) }}
 
   <p class="govuk-body">
     Uploaded by {{ contact_list.created_by }} {{ contact_list.created_at|format_datetime_human }}.

app/templates/views/uploads/contact-list/ok.html

@@ -4,17 +4,19 @@
 {% from "components/table.html" import list_table, field, text_field, index_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 %}
   {{ original_file_name }}
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.upload_contact_list', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
-    original_file_name,
-    back_link=url_for('main.upload_contact_list', service_id=current_service.id)
-  ) }}
+  {{ page_header(original_file_name) }}
 
   <p class="govuk-body">
     {{ recipients|length|recipient_count(recipients.template_type) }} found

app/templates/views/uploads/contact-list/upload.html

@@ -3,11 +3,18 @@
 {% from "components/file-upload.html" import file_upload %}
 {% from "components/page-header.html" import page_header %}
 {% 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 an emergency contact list
 {% endblock %}
 
+{% block backLink %}
+  {% if not error %}
+    {{ govukBackLink({ "href": url_for('main.uploads', service_id=current_service.id) }) }}
+  {% endif %}
+{% endblock %}
+
 {% block maincolumn_content %}
   {% if error %}
     {% call banner_wrapper(type='dangerous') %}
@@ -17,10 +24,7 @@
       {% endif %}
     {% endcall %}
   {% else %}
-    {{ page_header(
-      'Upload an emergency contact list',
-      back_link=url_for('main.uploads', service_id=current_service.id)
-    ) }}
+    {{ page_header('Upload an emergency contact list') }}
     <p class="govuk-body">
       Save a list of staff email addresses or phone numbers in Notify.
     </p>

app/templates/views/uploads/uploaded-letters.html

@@ -1,16 +1,18 @@
 {% extends "withnav_template.html" %}
 {% from "components/page-header.html" import page_header %}
+{% from "components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Uploaded letters
 {% endblock %}
 
+{% block backLink %}
+  {{ govukBackLink({ "href": url_for('main.uploads', service_id=current_service.id) }) }}
+{% endblock %}
+
 {% block maincolumn_content %}
 
-  {{ page_header(
-    'Uploaded letters',
-    back_link=url_for('main.uploads', service_id=current_service.id)
-  ) }}
+  {{ page_header('Uploaded letters') }}
 
   {% if notifications %}