darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-10 10:03:21 -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/organisations/add-gp-organisation.html
View File

@@ -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(
'Accept our data sharing and financial agreement',
back_link=url_for('main.request_to_go_live', service_id=current_service.id)
) }}
{{ page_header('Accept our data sharing and financial agreement') }}
{% call form_wrapper() %}
{% call select_wrapper(form.same_as_service_name) %}
{% for option in form.same_as_service_name %}

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

@@ -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_title,
back_link=url_for('main.request_to_go_live', service_id=current_service.id)
) }}
{{ page_header(page_title) }}
{% call form_wrapper() %}
<p class="govuk-body">
{{ form.organisations.label.text }}

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

@@ -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(
"Data sharing and financial agreement",
back_link=url_for('.organisation_settings', org_id=current_org.id)
) }}
{{ page_header("Data sharing and financial agreement") }}
<div class="govuk-grid-row">
<div class="govuk-grid-column-five-sixths">
{% call form_wrapper() %}

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

@@ -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 %}
{% extends "org_template.html" %}
{% from "components/back-link/macro.njk" import govukBackLink %}
{% 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(
"Crown organisation",
back_link=url_for('.organisation_settings', org_id=current_org.id)
) }}
{{ page_header("Crown organisation") }}
<div class="govuk-grid-row">
<div class="govuk-grid-column-five-sixths">
{% call form_wrapper() %}

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

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

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

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

10
app/templates/views/organisations/organisation/settings/edit-name/confirm.html
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 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(
'Confirm organisation name change',
back_link=url_for('.organisation_settings', org_id=current_org.id)
) }}
{{ page_header('Confirm organisation name change') }}
<div class="govuk-grid-row">
<div class="govuk-grid-column-three-quarters">

10
app/templates/views/organisations/organisation/settings/edit-name/index.html
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 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(
'Change organisation name',
back_link=url_for('.organisation_settings', org_id=current_org.id)
) }}
{{ page_header('Change organisation name') }}
{% call form_wrapper() %}
{{ form.name }}

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

@@ -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 %}
{% extends "org_template.html" %}
{% from "components/back-link/macro.njk" import govukBackLink %}
{% 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(
'Edit organisation billing details',
back_link=url_for('.organisation_settings', org_id=current_org.id)
) }}
{{ page_header('Edit organisation billing details') }}
{% call form_wrapper() %}
{{ form.billing_contact_names(param_extensions={"classes": "govuk-!-width-full"}) }}

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

@@ -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 %}
{% extends "org_template.html" %}
{% from "components/back-link/macro.njk" import govukBackLink %}
{% 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(
'Edit organisation notes',
back_link=url_for('.organisation_settings', org_id=current_org.id)
) }}
{{ page_header('Edit organisation notes') }}
{% call form_wrapper() %}
{{ textbox(
form.notes,

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

@@ -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 %}
{% extends "org_template.html" %}
{% from "components/back-link/macro.njk" import govukBackLink %}
{% 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(
"Organisation sector",
back_link=url_for('.organisation_settings', org_id=current_org.id)
) }}
{{ page_header("Organisation sector") }}
{% call form_wrapper() %}
{{ form.organisation_type }}
{{ page_footer('Save') }}

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

@@ -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_title,
back_link=url_for('.organisation_settings', org_id=current_org.id)
) }}
{{ page_header(page_title) }}
{% call form_wrapper(data_kwargs={'preview-type': 'email'}) %}
<div class="govuk-grid-row">
<div class="govuk-grid-column-full preview-pane">

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

@@ -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_title,
back_link=url_for('.organisation_settings', org_id=current_org.id)
) }}
{{ page_header(page_title) }}
{% call form_wrapper(data_kwargs={'preview-type': 'letter'}) %}
<div class="govuk-grid-row">
<div class="govuk-grid-column-full preview-pane">

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

@@ -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(
"Invite a team member",
back_link=url_for('.manage_org_users', org_id=current_org.id)
) }}
{{ page_header("Invite a team member") }}
{% call form_wrapper() %}
{{ form.email_address(
param_extensions={

10
app/templates/views/organisations/organisation/users/user/index.html
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 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(
user.name or user.email_localpart,
back_link=url_for('.manage_org_users', org_id=current_org.id)
) }}
{{ page_header(user.name or user.email_localpart) }}
<p class="govuk-body">
{{ user.email_address }}