diff --git a/app/templates/views/edit-sms-template.html b/app/templates/views/edit-sms-template.html
index 0acdd046c..414e467d9 100644
--- a/app/templates/views/edit-sms-template.html
+++ b/app/templates/views/edit-sms-template.html
@@ -1,5 +1,6 @@
{% extends "withnav_template.html" %}
{% from "components/textbox.html" import textbox %}
+{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import sticky_page_footer %}
{% from "components/radios.html" import radios %}
{% from "components/form.html" import form_wrapper %}
@@ -10,9 +11,10 @@
{% block maincolumn_content %}
-
+ {{ page_header(
+ '{} text message template'.format(heading_action),
+ back_link=url_for('main.view_template', service_id=current_service.id, template_id=template.id) if template else url_for('main.choose_template', service_id=current_service.id, template_folder_id=template_folder_id)
+ ) }}
{% call form_wrapper() %}
diff --git a/app/templates/views/edit-user-permissions.html b/app/templates/views/edit-user-permissions.html
index ebc307aae..8c9ca176c 100644
--- a/app/templates/views/edit-user-permissions.html
+++ b/app/templates/views/edit-user-permissions.html
@@ -1,5 +1,6 @@
{% extends "withnav_template.html" %}
{% from "components/textbox.html" import textbox %}
+{% 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/banner.html" import banner %}
@@ -18,9 +19,10 @@
) }}
{% endif %}
-
- {{ user.name or user.email_localpart }}
-
+ {{ page_header(
+ user.name or user.email_localpart,
+ back_link=url_for('main.manage_users', service_id=current_service.id)
+ ) }}
{{ user.email_address }} Change
diff --git a/app/templates/views/email-branding/manage-branding.html b/app/templates/views/email-branding/manage-branding.html
index 42d695786..660e42238 100644
--- a/app/templates/views/email-branding/manage-branding.html
+++ b/app/templates/views/email-branding/manage-branding.html
@@ -1,5 +1,6 @@
{% extends "views/platform-admin/_base_template.html" %}
{% from "components/file-upload.html" import file_upload %}
+{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/textbox.html" import textbox %}
{% from "components/radios.html" import radios %}
@@ -11,7 +12,10 @@
{% block platform_admin_content %}
-
{{ '{} email branding'.format('Update' if email_branding else 'Add')}}
+ {{ page_header(
+ '{} email branding'.format('Update' if email_branding else 'Add'),
+ back_link=url_for('.email_branding')
+ ) }}
{% if logo %}
@@ -32,9 +36,7 @@
{{ page_footer(
'Save',
button_name='operation',
- button_value='email-branding-details',
- back_link=url_for('.email_branding'),
- back_link_text='Back to email branding selection',
+ button_value='email-branding-details'
) }}
{% endcall %}
diff --git a/app/templates/views/invite-user.html b/app/templates/views/invite-user.html
index ab28c367e..6ffb0ba04 100644
--- a/app/templates/views/invite-user.html
+++ b/app/templates/views/invite-user.html
@@ -1,6 +1,7 @@
{% extends "withnav_template.html" %}
{% from "components/checkbox.html" import checkbox %}
{% from "components/textbox.html" import textbox %}
+{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
@@ -10,9 +11,10 @@
{% block maincolumn_content %}
-
- Invite a team member
-
+ {{ page_header(
+ 'Invite a team member',
+ back_link=url_for('main.manage_users', service_id=current_service.id)
+ ) }}
{% call form_wrapper() %}
diff --git a/app/templates/views/letter-branding/manage-letter-branding.html b/app/templates/views/letter-branding/manage-letter-branding.html
index e815d1057..2ece938e6 100644
--- a/app/templates/views/letter-branding/manage-letter-branding.html
+++ b/app/templates/views/letter-branding/manage-letter-branding.html
@@ -1,5 +1,6 @@
{% extends "views/platform-admin/_base_template.html" %}
{% from "components/file-upload.html" import file_upload %}
+{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/textbox.html" import textbox %}
{% from "components/form.html" import form_wrapper %}
@@ -11,6 +12,10 @@
{% block platform_admin_content %}
{{ '{} letter branding'.format('Update' if is_update else 'Add')}}
+ {{ page_header(
+ '{} letter branding'.format('Update' if is_update else 'Add'),
+ back_link=url_for('main.letter_branding')
+ ) }}
{% if logo %}
@@ -28,9 +33,7 @@
{{ page_footer(
'Save',
button_name='operation',
- button_value='branding-details',
- back_link=url_for('main.letter_branding'),
- back_link_text='Back to letter branding selection',
+ button_value='branding-details'
) }}
{% endcall %}
diff --git a/app/templates/views/manage-users/confirm-edit-user-email.html b/app/templates/views/manage-users/confirm-edit-user-email.html
index 322d470fe..7a1ab5d6b 100644
--- a/app/templates/views/manage-users/confirm-edit-user-email.html
+++ b/app/templates/views/manage-users/confirm-edit-user-email.html
@@ -1,4 +1,5 @@
{% extends "withnav_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 %}
@@ -8,7 +9,10 @@
{% block maincolumn_content %}
-
Confirm change of email address
+{{ page_header(
+ 'Confirm change of email address',
+ url_for('.edit_user_email', service_id=service_id, user_id=user.id)
+) }}
@@ -18,11 +22,7 @@
{{ new_email }}
We will send {{ user.name }} an email to tell them about the change.
- {{ page_footer(
- 'Confirm',
- destructive=destructive,
- back_link=url_for('.edit_user_email', service_id=service_id, user_id=user.id)
- ) }}
+ {{ page_footer('Confirm') }}
{% endcall %}
diff --git a/app/templates/views/manage-users/confirm-edit-user-mobile-number.html b/app/templates/views/manage-users/confirm-edit-user-mobile-number.html
index 461035f24..a072f866c 100644
--- a/app/templates/views/manage-users/confirm-edit-user-mobile-number.html
+++ b/app/templates/views/manage-users/confirm-edit-user-mobile-number.html
@@ -1,4 +1,5 @@
{% extends "withnav_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 %}
@@ -8,7 +9,10 @@
{% block maincolumn_content %}
-
Confirm change of mobile number
+{{ page_header(
+ 'Confirm change of mobile number',
+ back_link=url_for('.edit_user_mobile_number', service_id=service_id, user_id=user.id)
+) }}
@@ -18,11 +22,7 @@
{{ new_mobile_number }}
We will send {{ user.name }} a text message to tell them about the change.
- {{ page_footer(
- 'Confirm',
- destructive=destructive,
- back_link=url_for('.edit_user_mobile_number', service_id=service_id, user_id=user.id)
- ) }}
+ {{ page_footer('Confirm') }}
{% endcall %}
diff --git a/app/templates/views/manage-users/edit-user-email.html b/app/templates/views/manage-users/edit-user-email.html
index 4dcdb21e3..fa3c2ef53 100644
--- a/app/templates/views/manage-users/edit-user-email.html
+++ b/app/templates/views/manage-users/edit-user-email.html
@@ -1,5 +1,6 @@
{% extends "withnav_template.html" %}
{% from "components/textbox.html" import textbox %}
+{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
@@ -9,19 +10,15 @@
{% block maincolumn_content %}
-
Change team member’s email address
+ {{ page_header(
+ 'Change team member’s email address',
+ back_link=url_for('main.edit_user_permissions', service_id=current_service.id, user_id=user.id)
+ ) }}
+
This will change the email address for {{ user.name }}.
-
-
- {% call form_wrapper() %}
- {{ textbox(form.email_address, safe_error_message=True) }}
- {{ page_footer(
- 'Save',
- back_link=url_for('.edit_user_permissions', service_id=service_id, user_id=user.id),
- back_link_text="Back"
- ) }}
- {% endcall %}
-
-
+ {% call form_wrapper() %}
+ {{ textbox(form.email_address, width='1-1', safe_error_message=True) }}
+ {{ page_footer('Save') }}
+ {% endcall %}
{% endblock %}
diff --git a/app/templates/views/manage-users/edit-user-mobile.html b/app/templates/views/manage-users/edit-user-mobile.html
index 08cadbc61..3c9efa052 100644
--- a/app/templates/views/manage-users/edit-user-mobile.html
+++ b/app/templates/views/manage-users/edit-user-mobile.html
@@ -1,5 +1,6 @@
{% extends "withnav_template.html" %}
{% from "components/textbox.html" import textbox %}
+{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
@@ -9,17 +10,17 @@
{% block maincolumn_content %}
-
Change team member’s mobile number
+ {{ page_header(
+ 'Change team member’s mobile number',
+ back_link=url_for('main.edit_user_permissions', service_id=current_service.id, user_id=user.id)
+ ) }}
+
This will change the mobile number for {{ user.name }}.
{% call form_wrapper(class="extra-tracking") %}
{{ textbox(form.mobile_number) }}
- {{ page_footer(
- 'Save',
- back_link=url_for('.edit_user_permissions', service_id=service_id, user_id=user.id),
- back_link_text="Back"
- ) }}
+ {{ page_footer('Save') }}
{% endcall %}
diff --git a/app/templates/views/notifications/check.html b/app/templates/views/notifications/check.html
index 21854b4b7..bdf55ecf4 100644
--- a/app/templates/views/notifications/check.html
+++ b/app/templates/views/notifications/check.html
@@ -1,6 +1,7 @@
{% extends "withnav_template.html" %}
{% from "components/banner.html" import banner_wrapper %}
{% from "components/message-count-label.html" import message_count_label %}
+{% from "components/page-header.html" import govuk_back_link, page_header %}
{% block service_page_title %}
{{ "Error" if error else "Preview of ‘{}’".format(template.name) }}
@@ -8,6 +9,7 @@
{% block maincolumn_content %}
{% if template.template_type == 'letter' and current_service.trial_mode %}
+ {{ govuk_back_link(back_link) }}
{% set error = 'trial-mode-letters' %}
{% call banner_wrapper(type='dangerous') %}
@@ -19,6 +21,7 @@
{% endcall %}
{% elif error == 'not-allowed-to-send-to' %}
+ {{ govuk_back_link(back_link) }}
{% call banner_wrapper(type='dangerous') %}
{% with
@@ -32,6 +35,7 @@
{% endcall %}
{% elif error == 'too-many-messages' %}
+ {{ govuk_back_link(back_link) }}
{% call banner_wrapper(type='dangerous') %}
{% include "partials/check/too-many-messages.html" %}
@@ -39,15 +43,17 @@
{% elif error == 'message-too-long' %}
{# the only row_errors we can get when sending one off messages is that the message is too long #}
+ {{ govuk_back_link(back_link) }}
{% call banner_wrapper(type='dangerous') %}
{% include "partials/check/message-too-long.html" %}
{% endcall %}
{% else %}
-
- Preview of ‘{{ template.name }}’
-
+ {{ page_header(
+ 'Preview of ‘{}’'.format(template.name),
+ back_link=back_link
+ ) }}
{% endif %}
{{ template|string }}
@@ -63,7 +69,6 @@
{% if not error %}
Send 1 {{ message_count_label(1, template.template_type, suffix='') }}
{% endif %}
-
{% if template.template_type == 'letter' %}
{% endif %}
diff --git a/app/templates/views/notifications/notification.html b/app/templates/views/notifications/notification.html
index 241ce36d2..d02282124 100644
--- a/app/templates/views/notifications/notification.html
+++ b/app/templates/views/notifications/notification.html
@@ -2,6 +2,7 @@
{% from "components/banner.html" import banner %}
{% from "components/ajax-block.html" import ajax_block %}
{% from "components/message-count-label.html" import message_count_label %}
+{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% block service_page_title %}
@@ -10,9 +11,10 @@
{% block maincolumn_content %}
-
- {{ message_count_label(1, template.template_type, suffix='') | capitalize }}
-
+ {{ page_header(
+ message_count_label(1, template.template_type, suffix='') | capitalize,
+ back_link=None if request.args.get('help') == '0' else url_for('main.view_notifications', service_id=current_service.id, message_type=template.template_type)
+ ) }}
{% if is_precompiled_letter %}
diff --git a/app/templates/views/organisations/add-organisation.html b/app/templates/views/organisations/add-organisation.html
index 0d10cb8c1..19218dcd3 100644
--- a/app/templates/views/organisations/add-organisation.html
+++ b/app/templates/views/organisations/add-organisation.html
@@ -1,4 +1,5 @@
{% extends "views/platform-admin/_base_template.html" %}
+{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/textbox.html" import textbox %}
{% from "components/form.html" import form_wrapper %}
@@ -13,14 +14,14 @@
{% block platform_admin_content %}
-
New organisation
+ {{ page_header(
+ 'New organisation',
+ back_link=url_for('.organisations')
+ ) }}
+
{% call form_wrapper() %}
{{textbox(form.name)}}
- {{ page_footer(
- 'Save',
- back_link=url_for('.organisations'),
- back_link_text='Back to organisations',
- ) }}
+ {{ page_footer('Save') }}
{% endcall %}
{% endblock %}
diff --git a/app/templates/views/organisations/organisation/settings/edit-name/confirm.html b/app/templates/views/organisations/organisation/settings/edit-name/confirm.html
index bee677b1a..8fd5f263f 100644
--- a/app/templates/views/organisations/organisation/settings/edit-name/confirm.html
+++ b/app/templates/views/organisations/organisation/settings/edit-name/confirm.html
@@ -1,5 +1,6 @@
{% extends "org_template.html" %}
{% from "components/textbox.html" import textbox %}
+{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
@@ -9,7 +10,10 @@
{% block maincolumn_content %}
-
Confirm organisation name change
+ {{ page_header(
+ 'Confirm organisation name change',
+ back_link=url_for('.organisation_settings', org_id=current_org.id)
+ ) }}
@@ -17,11 +21,7 @@
{% call form_wrapper() %}
{{ textbox(form.password) }}
Your organisation name will be changed from {{ current_org.name }} to {{ new_name }}
- {{ page_footer(
- 'Confirm',
- destructive=destructive,
- back_link=url_for('.organisation_settings', org_id=current_org.id)
- ) }}
+ {{ page_footer('Confirm') }}
{% endcall %}
diff --git a/app/templates/views/organisations/organisation/settings/edit-name/index.html b/app/templates/views/organisations/organisation/settings/edit-name/index.html
index abc35a0cc..5e9f5b7c4 100644
--- a/app/templates/views/organisations/organisation/settings/edit-name/index.html
+++ b/app/templates/views/organisations/organisation/settings/edit-name/index.html
@@ -1,4 +1,5 @@
{% extends "org_template.html" %}
+{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/textbox.html" import textbox %}
{% from "components/form.html" import form_wrapper %}
@@ -9,14 +10,14 @@
{% block maincolumn_content %}
-
Change organisation name
+ {{ page_header(
+ 'Change organisation name',
+ back_link=url_for('.organisation_settings', org_id=current_org.id)
+ ) }}
+
{% call form_wrapper() %}
{{textbox(form.name)}}
- {{ page_footer(
- 'Save',
- back_link=url_for('.organisation_settings', org_id=current_org.id),
- back_link_text='Back to settings',
- ) }}
+ {{ page_footer('Save') }}
{% endcall %}
{% endblock %}
diff --git a/app/templates/views/organisations/organisation/users/user/index.html b/app/templates/views/organisations/organisation/users/user/index.html
index 1f52a3115..f4e1d6a43 100644
--- a/app/templates/views/organisations/organisation/users/user/index.html
+++ b/app/templates/views/organisations/organisation/users/user/index.html
@@ -1,5 +1,6 @@
{% extends "withnav_template.html" %}
{% from "components/textbox.html" import textbox %}
+{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
@@ -9,9 +10,10 @@
{% block maincolumn_content %}
-
- {{ user.name or user.email_localpart }}
-
+ {{ page_header(
+ user.name or user.email_localpart,
+ back_link=url_for('.manage_org_users', org_id=current_org.id)
+ ) }}
{{ user.email_address }}
@@ -20,8 +22,6 @@
{% call form_wrapper(class="column-three-quarters") %}
{{ page_footer(
'Save',
- back_link=url_for('.manage_org_users', org_id=current_org.id),
- back_link_text="Back",
delete_link=url_for('.remove_user_from_organisation', org_id=current_org.id, user_id=user.id) if user or None,
delete_link_text='Remove user from organisation'
) }}
diff --git a/app/templates/views/providers/edit-provider.html b/app/templates/views/providers/edit-provider.html
index 4fbe4acbd..70703f2d6 100644
--- a/app/templates/views/providers/edit-provider.html
+++ b/app/templates/views/providers/edit-provider.html
@@ -1,5 +1,6 @@
{% extends "withoutnav_template.html" %}
{% from "components/textbox.html" import textbox %}
+{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
@@ -12,7 +13,10 @@ Provider - {{provider.display_name}}
-
{{provider.display_name}}
+ {{ page_header(
+ provider.display_name,
+ back_link=url_for('.view_providers')
+ ) }}
Update provider:
@@ -22,7 +26,7 @@ Provider - {{provider.display_name}}
{% call form_wrapper() %}
{{ textbox(form.priority) }}
- {{ page_footer('Save', back_link=url_for('.view_providers'), back_link_text="Back to providers") }}
+ {{ page_footer('Save') }}
{% endcall %}
diff --git a/app/templates/views/providers/provider.html b/app/templates/views/providers/provider.html
index d934e7ff0..3a107cbd2 100644
--- a/app/templates/views/providers/provider.html
+++ b/app/templates/views/providers/provider.html
@@ -1,5 +1,6 @@
{% extends "withoutnav_template.html" %}
{% from "components/table.html" import list_table, field, text_field, link_field, right_aligned_field_heading, hidden_field_heading %}
+{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% block per_page_title %}
@@ -9,8 +10,12 @@ Provider versions
{% block maincolumn_content %}
-
-
{{ provider_versions[0].display_name }}
+
+
+ {{ page_header(
+ provider_versions[0].display_name,
+ back_link=url_for('main.view_providers')
+ ) }}
{% call(item, row_number) list_table(
provider_versions,
@@ -41,11 +46,6 @@ Provider versions
{% endcall %}
- {{ page_footer(
- back_link=url_for('main.view_providers'),
- back_link_text="Back to providers"
- ) }}
-
diff --git a/app/templates/views/send-test.html b/app/templates/views/send-test.html
index 8764b5479..20c1728f3 100644
--- a/app/templates/views/send-test.html
+++ b/app/templates/views/send-test.html
@@ -1,4 +1,5 @@
{% extends "withnav_template.html" %}
+{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/message-count-label.html" import recipient_count_label %}
{% from "components/textbox.html" import textbox %}
@@ -10,9 +11,10 @@
{% block maincolumn_content %}
-
- {{ page_title }}
-
+ {{ page_header(
+ page_title,
+ back_link=back_link
+ ) }}
{% call form_wrapper(
class='js-stick-at-top-when-scrolling send-one-off-form' if template.template_type != 'sms' else 'send-one-off-form',
@@ -40,7 +42,7 @@
{% endif %}
- {{ page_footer('Continue', back_link=back_link) }}
+ {{ page_footer('Continue') }}
{% endcall %}
{{ template|string }}
diff --git a/app/templates/views/send.html b/app/templates/views/send.html
index 21666fef4..64772b9e6 100644
--- a/app/templates/views/send.html
+++ b/app/templates/views/send.html
@@ -1,4 +1,5 @@
{% extends "withnav_template.html" %}
+{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/file-upload.html" import file_upload %}
{% from "components/message-count-label.html" import recipient_count_label %}
@@ -10,9 +11,10 @@
{% block maincolumn_content %}
-
- Upload a list of {{ recipient_count_label(999, template.template_type) }}
-
+ {{ page_header(
+ 'Upload a list of {}'.format(recipient_count_label(999, template.template_type)),
+ back_link=url_for('main.send_one_off', service_id=current_service.id, template_id=template.id)
+ ) }}