darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-07 15:18:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Katie Smith
2021-07-30 18:23:12 +01:00
parent 1860b2b690
commit 0f0b8b8ae4
120 changed files with 773 additions and 538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/templates/views/support/bat-phone.html
View File

@@ -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(
'Out of hours emergencies',
url_for('.support')
)}}
{{ page_header('Out of hours emergencies')}}
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<p class="govuk-body">

10
app/templates/views/support/form.html
View File

@@ -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_title,
back_link=back_link
) }}
{{ page_header(page_title) }}
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
{% if show_status_page_banner %}

10
app/templates/views/support/public.html
View File

@@ -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(
'The GOV.UK Notify service is for people who work in the government',
back_link=url_for('.support')
) }}
{{ page_header('The GOV.UK Notify service is for people who work in the government') }}
<p class="govuk-body">
We cannot give advice to the public. We do not have access to information about you held by government departments.

10
app/templates/views/support/thanks.html
View File

@@ -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 %}
Thanks for contacting us
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('.support') }) }}
{% endblock %}
{% block maincolumn_content %}
{{ page_header(
'Thanks for contacting us',
back_link=url_for('.support')
) }}
{{ page_header('Thanks for contacting us') }}
<p class="govuk-body">
{% if out_of_hours_emergency %}
We’ll reply in the next 30 minutes.

10
app/templates/views/support/triage.html
View File

@@ -2,19 +2,21 @@
{% 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 per_page_title %}
{{ page_title }}
{% 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_title,
back_link=url_for('.support')
) }}
{{ page_header(page_title) }}
{% call form_wrapper() %}
{{ form.severe }}
{{ page_footer('Continue') }}