darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-11 10:28:41 -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-08-03 11:28:15 +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
app/templates/views/user-profile/authenticate.html
+6 -4
View File
@@ -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 your {{ thing }}
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": back_link }) }}
{% endblock %}
{% block maincolumn_content %}
{{ page_header(
'Change your {}'.format(thing),
back_link=back_link
) }}
{{ page_header('Change your {}'.format(thing)) }}
<div class="govuk-grid-row">
<div class="govuk-grid-column-three-quarters">
app/templates/views/user-profile/change-password.html
+6 -4
View File
@@ -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 your password
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('.user_profile') }) }}
{% endblock %}
{% block maincolumn_content %}
{{ page_header(
'Change your password',
back_link=url_for('.user_profile')
) }}
{{ page_header('Change your password') }}
<div class="govuk-grid-row">
<div class="govuk-grid-column-three-quarters">
app/templates/views/user-profile/change.html
+6 -4
View File
@@ -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 your {{ thing }}
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('.user_profile') }) }}
{% endblock %}
{% block maincolumn_content %}
{{ page_header(
'Change your {}'.format(thing),
back_link=url_for('.user_profile')
) }}
{{ page_header('Change your {}'.format(thing)) }}
<div class="govuk-grid-row">
<div class="govuk-grid-column-three-quarters">
app/templates/views/user-profile/confirm.html
+6 -4
View File
@@ -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 your {{ thing }}
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('.user_profile') }) }}
{% endblock %}
{% block maincolumn_content %}
{{ page_header(
'Change your {}'.format(thing),
back_link=url_for('.user_profile')
) }}
{{ page_header('Change your {}'.format(thing)) }}
<div class="govuk-grid-row">
<div class="govuk-grid-column-three-quarters">
app/templates/views/user-profile/manage-security-key.html
+6 -5
View File
@@ -2,7 +2,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 = 'Manage ' + '‘' + security_key.name + '’' %}
@@ -10,11 +10,12 @@
{{ page_title }}
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('.user_profile_security_keys') }) }}
{% endblock %}
{% block maincolumn_content %}
{{ page_header(
page_title,
back_link=url_for('.user_profile_security_keys')
) }}
{{ page_header(page_title) }}
<div class="govuk-grid-row">
<div class="govuk-grid-column-three-quarters">