diff --git a/app/assets/stylesheets/components/vendor/govuk-back-link.scss b/app/assets/stylesheets/components/vendor/govuk-back-link.scss new file mode 100644 index 000000000..6e89b55a4 --- /dev/null +++ b/app/assets/stylesheets/components/vendor/govuk-back-link.scss @@ -0,0 +1,35 @@ +.govuk-back-link { + + @include core-16; + color: $text-colour; + display: inline-block; + position: relative; + margin-top: $gutter-half; + margin-bottom: $gutter / 3; + padding-left: $gutter-half - 1px; + border-bottom: 1px solid $text-colour; + text-decoration: none; + + &:link, + &:visited { + color: $text-colour; + } + + &:before { + display: block; + width: 0; + height: 0; + border-style: solid; + border-color: transparent; + -webkit-clip-path: polygon(0% 50%, 100% 100%, 100% 0%); + clip-path: polygon(0% 50%, 100% 100%, 100% 0%); + border-width: 5px 6px 5px 0; + border-right-color: inherit; + content: ""; + position: absolute; + top: -1px; + bottom: 1px; + left: 0; + margin: auto; + } +} diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index 0b243f45b..9e65003e1 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -65,6 +65,7 @@ $path: '/static/images/'; @import 'components/vendor/responsive-embed'; @import 'components/preview-pane'; @import 'components/task-list'; +@import 'components/vendor/govuk-back-link'; @import 'views/dashboard'; @import 'views/users'; diff --git a/app/main/views/templates.py b/app/main/views/templates.py index 06a8a2250..267913ec2 100644 --- a/app/main/views/templates.py +++ b/app/main/views/templates.py @@ -409,7 +409,7 @@ def copy_template(service_id, template_id): return render_template( 'views/edit-{}-template.html'.format(template['template_type']), form=form, - template_type=template['template_type'], + template=template, heading_action='Add', services=user_api_client.get_service_ids_for_user(current_user), ) @@ -570,6 +570,7 @@ def add_service_template(service_id, template_type, template_folder_id=None): '.action_blocked', service_id=service_id, notification_type=template_type, + template_folder_id=template_folder_id, return_to='templates', template_id='0' )) @@ -578,6 +579,7 @@ def add_service_template(service_id, template_type, template_folder_id=None): 'views/edit-{}-template.html'.format(template_type), form=form, template_type=template_type, + template_folder_id=template_folder_id, heading_action='New', ) @@ -665,8 +667,7 @@ def edit_service_template(service_id, template_id): return render_template( 'views/edit-{}-template.html'.format(template['template_type']), form=form, - template_id=template_id, - template_type=template['template_type'], + template=template, heading_action='Edit', ) diff --git a/app/templates/components/page-header.html b/app/templates/components/page-header.html new file mode 100644 index 000000000..bdf2f4c4f --- /dev/null +++ b/app/templates/components/page-header.html @@ -0,0 +1,19 @@ +{% macro page_header( + h1, + back_link=None +) %} + + {% if back_link %} + {{ govuk_back_link(back_link) }} + {% endif %} + +

{{ h1 }}

+ +{% endmacro %} + + +{% macro govuk_back_link(back_link) %} + + Back + +{% endmacro %} diff --git a/app/templates/views/add-service.html b/app/templates/views/add-service.html index b4bc173bc..ad7c30229 100644 --- a/app/templates/views/add-service.html +++ b/app/templates/views/add-service.html @@ -1,6 +1,7 @@ {% extends "withoutnav_template.html" %} {% from "components/radios.html" import radios %} {% 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 %} @@ -13,9 +14,7 @@
-

- About your service -

+ {{ page_header('About your service') }} {% call form_wrapper() %} diff --git a/app/templates/views/api/callbacks.html b/app/templates/views/api/callbacks.html index 6ed1c4f06..7bdf36583 100644 --- a/app/templates/views/api/callbacks.html +++ b/app/templates/views/api/callbacks.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/table.html" import mapping_table, row, text_field, edit_field, optional_text_field with context %} @@ -9,7 +10,10 @@ {% endblock %} {% block maincolumn_content %} -

Callbacks

+ {{ page_header( + 'Callbacks', + back_link=url_for('main.api_integration', service_id=current_service.id) + ) }}
{% call mapping_table( caption='General', @@ -30,8 +34,4 @@ {% endcall %} {% endcall %}
- {{ page_footer( - secondary_link=url_for('.api_integration', service_id=current_service.id), - secondary_link_text='Back to API integration' - ) }} {% endblock %} diff --git a/app/templates/views/api/callbacks/delivery-status-callback.html b/app/templates/views/api/callbacks/delivery-status-callback.html index f5e7be807..2a8c4f358 100644 --- a/app/templates/views/api/callbacks/delivery-status-callback.html +++ b/app/templates/views/api/callbacks/delivery-status-callback.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 %} @@ -10,7 +11,12 @@ {% block maincolumn_content %}
-

Callbacks for delivery receipts

+ + {{ page_header( + 'Callbacks for delivery receipts', + back_link=url_for(back_link, service_id=current_service.id) + ) }} +

When you send an email or text message, we can tell you if Notify was able to deliver it. Check the callback documentation for more information. @@ -28,11 +34,6 @@ hint='At least 10 characters', autocomplete='new-password' ) }} - {{ page_footer( - 'Save', - back_link=url_for(back_link, service_id=current_service.id), - back_link_text='Back to settings' - ) }} {% endcall %}

diff --git a/app/templates/views/api/callbacks/received-text-messages-callback.html b/app/templates/views/api/callbacks/received-text-messages-callback.html index b8ede67a5..66c3f8867 100644 --- a/app/templates/views/api/callbacks/received-text-messages-callback.html +++ b/app/templates/views/api/callbacks/received-text-messages-callback.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 %} @@ -8,7 +9,10 @@ {% endblock %} {% block maincolumn_content %} -

Callbacks for received text messages

+ {{ page_header( + 'Callbacks for received text messages', + back_link=url_for('.api_callbacks', service_id=current_service.id) + ) }}

@@ -28,11 +32,7 @@ hint='At least 10 characters', autocomplete='new-password' ) }} - {{ page_footer( - 'Save', - back_link=url_for('.api_callbacks', service_id=current_service.id), - back_link_text='Back to settings' - ) }} + {{ page_footer('Save') }} {% endcall %}

diff --git a/app/templates/views/api/keys.html b/app/templates/views/api/keys.html index 758b0eb86..b0b1257fd 100644 --- a/app/templates/views/api/keys.html +++ b/app/templates/views/api/keys.html @@ -2,6 +2,7 @@ {% from "components/banner.html" import banner_wrapper %} {% from "components/table.html" import list_table, field, hidden_field_heading %} {% from "components/api-key.html" import api_key %} +{% 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 %} -

- API keys -

+ {{ page_header( + 'API keys', + back_link=url_for('main.api_integration', service_id=current_service.id) + ) }}
{% call(item, row_number) list_table( diff --git a/app/templates/views/api/keys/create.html b/app/templates/views/api/keys/create.html index c31e307ad..bdb8c2984 100644 --- a/app/templates/views/api/keys/create.html +++ b/app/templates/views/api/keys/create.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/textbox.html" import textbox %} {% from "components/radios.html" import radios %} @@ -11,9 +12,10 @@ {% block maincolumn_content %} -

- Create an API key -

+ {{ page_header( + 'Create an API key', + back_link=url_for('main.api_keys', service_id=current_service.id) + ) }} {% call form_wrapper() %} {{ textbox(form.key_name, label='Name for this key') }} diff --git a/app/templates/views/api/whitelist.html b/app/templates/views/api/whitelist.html index 9d227e294..18bc8a624 100644 --- a/app/templates/views/api/whitelist.html +++ b/app/templates/views/api/whitelist.html @@ -2,6 +2,7 @@ {% from "components/banner.html" import banner_wrapper %} {% from "components/table.html" import list_table, field, hidden_field_heading %} {% from "components/api-key.html" import api_key %} +{% from "components/page-header.html" import page_header %} {% from "components/page-footer.html" import page_footer %} {% from "components/list-entry.html" import list_entry %} {% from "components/form.html" import form_wrapper %} @@ -32,9 +33,10 @@ {% endcall %} {% else %} -

- Whitelist -

+ {{ page_header( + 'Whitelist', + back_link=url_for('main.api_integration', service_id=current_service.id) + ) }} {% endif %}

@@ -63,11 +65,7 @@

- {{ page_footer( - 'Save', - secondary_link=url_for('.api_integration', service_id=current_service.id), - secondary_link_text='Back to API integration' - ) }} + {{ page_footer('Save') }} {% endcall %} diff --git a/app/templates/views/check/column-errors.html b/app/templates/views/check/column-errors.html index 72f80cca7..50e68ea73 100644 --- a/app/templates/views/check/column-errors.html +++ b/app/templates/views/check/column-errors.html @@ -3,7 +3,7 @@ {% from "components/radios.html" import radio_select %} {% from "components/table.html" import list_table, field, text_field, index_field, hidden_field_heading %} {% from "components/file-upload.html" import file_upload %} -{% from "components/page-footer.html" import page_footer %} +{% from "components/page-header.html" import govuk_back_link %} {% from "components/message-count-label.html" import message_count_label %} {% set file_contents_header_id = 'file-preview' %} @@ -19,7 +19,9 @@ {% block maincolumn_content %} -
+ {{ govuk_back_link(back_link) }} + +
{% call banner_wrapper(type='dangerous') %} {% if recipients.too_many_rows %} @@ -135,9 +137,7 @@
- {% if request.args.from_test %} - Back - {% else %} + {% if not request.args.from_test %} {{ file_upload( form.file, action=url_for('.send_messages', service_id=current_service.id, template_id=template.id), diff --git a/app/templates/views/check/ok.html b/app/templates/views/check/ok.html index 52804960e..693208bf9 100644 --- a/app/templates/views/check/ok.html +++ b/app/templates/views/check/ok.html @@ -3,6 +3,7 @@ {% from "components/radios.html" import radio_select %} {% from "components/table.html" import list_table, field, text_field, index_field, hidden_field_heading %} {% 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/message-count-label.html" import message_count_label %} @@ -19,9 +20,11 @@ {% block maincolumn_content %} -

- Preview of {{ template.name }} -

+ {{ page_header( + 'Preview of {}'.format(template.name), + back_link=back_link + ) }} + {{ skip_to_file_contents() }} {{ template|string }} @@ -41,7 +44,6 @@ {% else %} Download as a PDF {% endif %} - Back
diff --git a/app/templates/views/check/row-errors.html b/app/templates/views/check/row-errors.html index c2db83b61..1bd71859e 100644 --- a/app/templates/views/check/row-errors.html +++ b/app/templates/views/check/row-errors.html @@ -3,7 +3,7 @@ {% from "components/radios.html" import radio_select %} {% from "components/table.html" import list_table, field, text_field, index_field, hidden_field_heading %} {% from "components/file-upload.html" import file_upload %} -{% from "components/page-footer.html" import page_footer %} +{% from "components/page-header.html" import govuk_back_link %} {% from "components/message-count-label.html" import message_count_label %} {% set file_contents_header_id = 'file-preview' %} @@ -19,6 +19,8 @@ {% block maincolumn_content %} + {{ govuk_back_link(back_link) }} +
{% call banner_wrapper(type='dangerous') %} {% if row_errors|length == 1 %} diff --git a/app/templates/views/edit-email-template.html b/app/templates/views/edit-email-template.html index b0ceb4b26..ec4ad6edd 100644 --- a/app/templates/views/edit-email-template.html +++ b/app/templates/views/edit-email-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 %} -

- {{ heading_action }} email template -

+ {{ page_header( + '{} email 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-letter-template.html b/app/templates/views/edit-letter-template.html index d78ba19f6..3d4c42665 100644 --- a/app/templates/views/edit-letter-template.html +++ b/app/templates/views/edit-letter-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 %} -

- {{ heading_action }} letter template -

+ {{ page_header( + '{} letter 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-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 %} -

- {{ heading_action }} text message template -

+ {{ 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 %} {% endif %} - Back {% if template.template_type == 'letter' %} Download as a PDF {% 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) + ) }}