diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index 7b4cfa462..5ba61df75 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -20,7 +20,7 @@ {% endblock %} {% block page_title %} - GOV.UK Notify admin + {% block per_page_title %}{% endblock %} – GOV.UK Notify {% endblock %} {% block cookie_message %} diff --git a/app/templates/views/add-service.html b/app/templates/views/add-service.html index 05395d5c7..75dcc3cae 100644 --- a/app/templates/views/add-service.html +++ b/app/templates/views/add-service.html @@ -2,8 +2,8 @@ {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} -{% block page_title %} - {{heading}} – GOV.UK Notify +{% block per_page_title %} + {{ heading }} {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/all-services.html b/app/templates/views/all-services.html index c278c8c5b..a1a44deff 100644 --- a/app/templates/views/all-services.html +++ b/app/templates/views/all-services.html @@ -1,8 +1,8 @@ {% extends "withoutnav_template.html" %} {% from "components/browse-list.html" import browse_list %} -{% block page_title %} - All service – GOV.UK Notify +{% block per_page_title %} + All services {% endblock %} {% block maincolumn_content %} @@ -13,4 +13,4 @@ {{ browse_list(services) }} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/views/api/documentation.html b/app/templates/views/api/documentation.html index f59f58168..156a5e0f6 100644 --- a/app/templates/views/api/documentation.html +++ b/app/templates/views/api/documentation.html @@ -3,8 +3,8 @@ {% from "components/api-key.html" import api_key %} {% from "components/page-footer.html" import page_footer %} -{% block page_title %} - API integration – GOV.UK Notify +{% block service_page_title %} + Documentation {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/api/index.html b/app/templates/views/api/index.html index 7b6144e04..1b99ff3e1 100644 --- a/app/templates/views/api/index.html +++ b/app/templates/views/api/index.html @@ -3,8 +3,8 @@ {% from "components/api-key.html" import api_key %} {% from "components/banner.html" import banner_wrapper %} -{% block page_title %} - API integration – GOV.UK Notify +{% block service_page_title %} + API integration {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/api/keys.html b/app/templates/views/api/keys.html index fef00a7b5..6dbb99f44 100644 --- a/app/templates/views/api/keys.html +++ b/app/templates/views/api/keys.html @@ -3,8 +3,8 @@ {% from "components/api-key.html" import api_key %} {% from "components/page-footer.html" import page_footer %} -{% block page_title %} - API integration – GOV.UK Notify +{% block service_page_title %} + API keys {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/api/keys/create.html b/app/templates/views/api/keys/create.html index 936bb8a05..7baf06680 100644 --- a/app/templates/views/api/keys/create.html +++ b/app/templates/views/api/keys/create.html @@ -4,8 +4,8 @@ {% from "components/radios.html" import radios %} {% from "components/banner.html" import banner_wrapper %} -{% block page_title %} - Create an API key – GOV.UK Notify +{% block service_page_title %} + Create an API key {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/api/keys/revoke.html b/app/templates/views/api/keys/revoke.html index 847436035..005c91d4b 100644 --- a/app/templates/views/api/keys/revoke.html +++ b/app/templates/views/api/keys/revoke.html @@ -2,8 +2,8 @@ {% from "components/page-footer.html" import page_footer %} {% from "components/api-key.html" import api_key %} -{% block page_title %} - Revoke API key – GOV.UK Notify +{% block service_page_title %} + Revoke API key {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/api/keys/show.html b/app/templates/views/api/keys/show.html index 645b0e07c..dd907fe93 100644 --- a/app/templates/views/api/keys/show.html +++ b/app/templates/views/api/keys/show.html @@ -2,8 +2,8 @@ {% from "components/page-footer.html" import page_footer %} {% from "components/api-key.html" import api_key %} -{% block page_title %} - New API key – GOV.UK Notify +{% block service_page_title %} + New API key {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/api/whitelist.html b/app/templates/views/api/whitelist.html index 441c1b00c..3a125e5b2 100644 --- a/app/templates/views/api/whitelist.html +++ b/app/templates/views/api/whitelist.html @@ -5,8 +5,8 @@ {% from "components/page-footer.html" import page_footer %} {% from "components/list-entry.html" import list_entry %} -{% block page_title %} - API integration – GOV.UK Notify +{% block service_page_title %} + Whitelist {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/cancelled-invitation.html b/app/templates/views/cancelled-invitation.html index 1e418505f..9a9e82cc9 100644 --- a/app/templates/views/cancelled-invitation.html +++ b/app/templates/views/cancelled-invitation.html @@ -1,5 +1,5 @@ {% extends "withoutnav_template.html" %} -{% block page_title %}Invitation has been cancelled{% endblock %} +{% block per_page_title %}Invitation has been cancelled{% endblock %} {% block maincolumn_content %}
diff --git a/app/templates/views/change-email-continue.html b/app/templates/views/change-email-continue.html index ac82905b0..7fbc1f043 100644 --- a/app/templates/views/change-email-continue.html +++ b/app/templates/views/change-email-continue.html @@ -1,7 +1,7 @@ {% extends "withoutnav_template.html" %} -{% block page_title %} - Check your email – GOV.UK Notify +{% block per_page_title %} + Check your email {% endblock %} {% block maincolumn_content %} @@ -10,4 +10,4 @@

An email has been sent to {{ new_email }}.

Click the link in the email to confirm the change to your email address.

-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/views/check.html b/app/templates/views/check.html index 9f24a26ba..4ec08c537 100644 --- a/app/templates/views/check.html +++ b/app/templates/views/check.html @@ -14,8 +14,8 @@

{% endmacro %} -{% block page_title %} - {{ "Error" if errors else "Preview" }} – GOV.UK Notify +{% block service_page_title %} + {{ "Error" if errors else "Preview" }} {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/choose-service.html b/app/templates/views/choose-service.html index fbc55ba4d..37d8b5c65 100644 --- a/app/templates/views/choose-service.html +++ b/app/templates/views/choose-service.html @@ -1,8 +1,8 @@ {% extends "withoutnav_template.html" %} {% from "components/browse-list.html" import browse_list %} -{% block page_title %} - Choose service – GOV.UK Notify +{% block per_page_title %} + Choose service {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/cookies.html b/app/templates/views/cookies.html index ba5113ffe..de20bbfc4 100644 --- a/app/templates/views/cookies.html +++ b/app/templates/views/cookies.html @@ -1,7 +1,7 @@ {% extends "withoutnav_template.html" %} -{% block page_title %} - Cookies – GOV.UK Notify +{% block per_page_title %} + Cookies {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html index 153030719..f9cad2104 100644 --- a/app/templates/views/dashboard/dashboard.html +++ b/app/templates/views/dashboard/dashboard.html @@ -6,8 +6,8 @@ {% from "components/table.html" import list_table, field, right_aligned_field_heading, hidden_field_heading %} {% from "components/ajax-block.html" import ajax_block %} -{% block page_title %} - Dashboard – GOV.UK Notify +{% block service_page_title %} + Dashboard {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/delivery-and-failure.html b/app/templates/views/delivery-and-failure.html index e5de2bc10..47f71c6dd 100644 --- a/app/templates/views/delivery-and-failure.html +++ b/app/templates/views/delivery-and-failure.html @@ -1,7 +1,7 @@ {% extends "withoutnav_template.html" %} -{% block page_title %} -Delivery and failure – GOV.UK Notify +{% block per_page_title %} +Delivery and failure {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/design-patterns-content-guidance.html b/app/templates/views/design-patterns-content-guidance.html index bc46ef4df..c8df6810f 100644 --- a/app/templates/views/design-patterns-content-guidance.html +++ b/app/templates/views/design-patterns-content-guidance.html @@ -1,8 +1,8 @@ {% from "components/banner.html" import banner_wrapper %} {% extends "withoutnav_template.html" %} -{% block page_title %} -Design patterns and content guidance – GOV.UK Notify +{% block per_page_title %} +Design patterns and content guidance {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/documentation.html b/app/templates/views/documentation.html index 28bacadb9..b23fd5772 100644 --- a/app/templates/views/documentation.html +++ b/app/templates/views/documentation.html @@ -1,7 +1,7 @@ {% extends "withoutnav_template.html" %} -{% block page_title %} - API documentation – GOV.UK Notify +{% block per_page_title %} + API documentation {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/edit-email-template.html b/app/templates/views/edit-email-template.html index 0ab2dd2ae..33790e878 100644 --- a/app/templates/views/edit-email-template.html +++ b/app/templates/views/edit-email-template.html @@ -3,8 +3,8 @@ {% from "components/page-footer.html" import page_footer %} {% from "components/radios.html" import radios %} -{% block page_title %} - {{ heading_action }} email template – GOV.UK Notify +{% block service_page_title %} + {{ heading_action }} email template {% endblock %} {% block maincolumn_content %} @@ -33,7 +33,7 @@
diff --git a/app/templates/views/edit-letter-template.html b/app/templates/views/edit-letter-template.html index 1dc29f6fb..f981b7008 100644 --- a/app/templates/views/edit-letter-template.html +++ b/app/templates/views/edit-letter-template.html @@ -2,8 +2,8 @@ {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} -{% block page_title %} - {{ heading_action }} letter template – GOV.UK Notify +{% block service_page_title %} + {{ heading_action }} letter template {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/edit-sms-template.html b/app/templates/views/edit-sms-template.html index 18de85387..33f636dc2 100644 --- a/app/templates/views/edit-sms-template.html +++ b/app/templates/views/edit-sms-template.html @@ -3,8 +3,8 @@ {% from "components/page-footer.html" import page_footer %} {% from "components/radios.html" import radios %} -{% block page_title %} - {{ heading_action }} text message template – GOV.UK Notify +{% block service_page_title %} + {{ heading_action }} text message template {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/edit-user-permissions.html b/app/templates/views/edit-user-permissions.html index 8dce64c72..93df5a411 100644 --- a/app/templates/views/edit-user-permissions.html +++ b/app/templates/views/edit-user-permissions.html @@ -2,8 +2,8 @@ {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} -{% block page_title %} -Manage users – GOV.UK Notify +{% block service_page_title %} +Manage users {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/forgot-password.html b/app/templates/views/forgot-password.html index 250a6319e..a221da183 100644 --- a/app/templates/views/forgot-password.html +++ b/app/templates/views/forgot-password.html @@ -2,8 +2,8 @@ {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} -{% block page_title %} -Create a new password – GOV.UK Notify +{% block per_page_title %} +Create a new password {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/information-security.html b/app/templates/views/information-security.html index 8b0ed4d13..c358b398f 100644 --- a/app/templates/views/information-security.html +++ b/app/templates/views/information-security.html @@ -1,8 +1,8 @@ {% from "components/banner.html" import banner_wrapper %} {% extends "withoutnav_template.html" %} -{% block page_title %} -Information security guidelines – GOV.UK Notify +{% block per_page_title %} +Information security guidelines {% endblock %} {% block maincolumn_content %} @@ -139,7 +139,7 @@ Information security guidelines – GOV.UK Notify

If you need to send someone a file, make the file available within your service, then link to it.

- +

Include the user’s name – it makes phishing more difficult

Start your message by addressing the user. For example, ‘Hi Alice Smith’, or ‘Dear Bob Jones’. Including this extra piece of information makes phishing more difficult.

@@ -152,10 +152,10 @@ Information security guidelines – GOV.UK Notify

TLS makes sure that no-one can intercept your emails.

- +

Examples

- +

Example of an appointment reminder

“Dear Anne Smith, you’ve got a licence appointment tomorrow at 2:15pm at the Licence Office, 1 Chapel Hill, Heswall, Bournemouth BH1 1AA. To cancel your appointment, visit licensing.service.gov.uk/appointment/12345678/cancel. To change your appointment time, sign in to your account.”

This is a good example because:

@@ -167,8 +167,8 @@ Information security guidelines – GOV.UK Notify
  • users have to sign in to change the appointment time, making it harder for an attacker to know what their appointment time is
  • the topic is something the user is familiar with
    • - - + +

    Example to add a photo to an environmental permit

    “Dear Andrew Jones, to add a location photo to your environmental permit application, visit environmentalpermit.service.gov.uk/12345678/add-photo. If you didn’t request this link, please ignore this message.”

    This is a good example because:

    @@ -180,7 +180,7 @@ Information security guidelines – GOV.UK Notify
  • it shows users what to do if the message doesn't apply to them
    • - +

    You can do more if you want to

    diff --git a/app/templates/views/integration_testing.html b/app/templates/views/integration_testing.html index fa6fec5bc..53dd64eb0 100644 --- a/app/templates/views/integration_testing.html +++ b/app/templates/views/integration_testing.html @@ -1,8 +1,8 @@ {% from "components/table.html" import mapping_table, row, text_field, edit_field, field %} {% extends "withoutnav_template.html" %} -{% block page_title %} - Integration testing - GOV.UK Notify +{% block per_page_title %} + Integration testing {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/invite-user.html b/app/templates/views/invite-user.html index ee392d935..34f7adb4a 100644 --- a/app/templates/views/invite-user.html +++ b/app/templates/views/invite-user.html @@ -3,8 +3,8 @@ {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} -{% block page_title %} -Manage users – GOV.UK Notify +{% block service_page_title %} +Manage users {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/jobs/job.html b/app/templates/views/jobs/job.html index 4c40370b8..a80bd7ad6 100644 --- a/app/templates/views/jobs/job.html +++ b/app/templates/views/jobs/job.html @@ -2,8 +2,8 @@ {% from "components/banner.html" import banner %} {% from "components/ajax-block.html" import ajax_block %} -{% block page_title %} - {{ uploaded_file_name }} – GOV.UK Notify +{% block service_page_title %} + {{ uploaded_file_name }} {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/jobs/jobs.html b/app/templates/views/jobs/jobs.html index 8c9441c20..d251a0e01 100644 --- a/app/templates/views/jobs/jobs.html +++ b/app/templates/views/jobs/jobs.html @@ -1,8 +1,8 @@ {% from "components/previous-next-navigation.html" import previous_next_navigation %} {% extends "withnav_template.html" %} -{% block page_title %} - Notifications activity – GOV.UK Notify +{% block service_page_title %} + Uploaded files {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/manage-users.html b/app/templates/views/manage-users.html index 00fffc682..498e70ffc 100644 --- a/app/templates/views/manage-users.html +++ b/app/templates/views/manage-users.html @@ -11,8 +11,8 @@ 'caption_visible': True } %} -{% block page_title %} -Manage users – GOV.UK Notify +{% block service_page_title %} +Manage users {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/new-password.html b/app/templates/views/new-password.html index cdae19079..082189374 100644 --- a/app/templates/views/new-password.html +++ b/app/templates/views/new-password.html @@ -2,8 +2,8 @@ {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} -{% block page_title %} - Create a new password – GOV.UK Notify +{% block per_page_title %} + Create a new password {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/notifications.html b/app/templates/views/notifications.html index 48e809358..61f16aff7 100644 --- a/app/templates/views/notifications.html +++ b/app/templates/views/notifications.html @@ -2,8 +2,8 @@ {% from "components/ajax-block.html" import ajax_block %} {% from "components/message-count-label.html" import message_count_label, recipient_count_label %} -{% block page_title %} - {{ message_count_label(99, message_type, suffix='') | capitalize }} – GOV.UK Notify +{% block service_page_title %} + {{ message_count_label(99, message_type, suffix='') | capitalize }} {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/password-reset-sent.html b/app/templates/views/password-reset-sent.html index 4d61c5ca6..2494536b9 100644 --- a/app/templates/views/password-reset-sent.html +++ b/app/templates/views/password-reset-sent.html @@ -1,7 +1,7 @@ {% extends "withoutnav_template.html" %} -{% block page_title %} -GOV.UK Notify +{% block per_page_title %} +Check your email {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/platform-admin.html b/app/templates/views/platform-admin.html index 47ecd4d14..22519751d 100644 --- a/app/templates/views/platform-admin.html +++ b/app/templates/views/platform-admin.html @@ -80,8 +80,8 @@ {% endmacro %} -{% block page_title %} - Platform admin – GOV.UK Notify +{% block per_page_title %} + Platform admin {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/pricing.html b/app/templates/views/pricing.html index 103044f7e..f7f173825 100644 --- a/app/templates/views/pricing.html +++ b/app/templates/views/pricing.html @@ -1,7 +1,7 @@ {% extends "withoutnav_template.html" %} -{% block page_title %} - Pricing – GOV.UK Notify +{% block per_page_title %} + Pricing {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/provider.html b/app/templates/views/provider.html index d2d197c39..7898ca6aa 100644 --- a/app/templates/views/provider.html +++ b/app/templates/views/provider.html @@ -3,8 +3,8 @@ {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} -{% block page_title %} -Provider - {{provider.display_name}} – GOV.UK Notify +{% block per_page_title %} +Provider - {{provider.display_name}} {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/providers.html b/app/templates/views/providers.html index 66c9b6b7b..377c99e3e 100644 --- a/app/templates/views/providers.html +++ b/app/templates/views/providers.html @@ -1,8 +1,8 @@ {% extends "withoutnav_template.html" %} {% from "components/table.html" import list_table, field, text_field, link_field, right_aligned_field_heading, hidden_field_heading %} -{% block page_title %} -Providers – GOV.UK Notify +{% block per_page_title %} +Providers {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/register-from-invite.html b/app/templates/views/register-from-invite.html index 1232e838a..d1f967ff1 100644 --- a/app/templates/views/register-from-invite.html +++ b/app/templates/views/register-from-invite.html @@ -2,8 +2,8 @@ {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} -{% block page_title %} -Create an account – GOV.UK Notify +{% block per_page_title %} +Create an account {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/register.html b/app/templates/views/register.html index 59ad9a88e..cad198d9b 100644 --- a/app/templates/views/register.html +++ b/app/templates/views/register.html @@ -2,8 +2,8 @@ {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} -{% block page_title %} -Create an account – GOV.UK Notify +{% block per_page_title %} +Create an account {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/registration-continue.html b/app/templates/views/registration-continue.html index e2d6e2be4..17e71a362 100644 --- a/app/templates/views/registration-continue.html +++ b/app/templates/views/registration-continue.html @@ -1,7 +1,7 @@ {% extends "withoutnav_template.html" %} -{% block page_title %} - Check your email – GOV.UK Notify +{% block per_page_title %} + Check your email {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/resend-email-verification.html b/app/templates/views/resend-email-verification.html index 928fac5b3..6c84af8be 100644 --- a/app/templates/views/resend-email-verification.html +++ b/app/templates/views/resend-email-verification.html @@ -2,8 +2,8 @@ {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} -{% block page_title %} - Check your email – GOV.UK Notify +{% block per_page_title %} + Check your email {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/send-from-api.html b/app/templates/views/send-from-api.html index 667316dcb..9794d7bf1 100644 --- a/app/templates/views/send-from-api.html +++ b/app/templates/views/send-from-api.html @@ -1,8 +1,8 @@ {% extends "withnav_template.html" %} {% from "components/api-key.html" import api_key %} -{% block page_title %} - API info – GOV.UK Notify +{% block service_page_title %} + API info {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/send-test.html b/app/templates/views/send-test.html index c801e08dc..333c65cdb 100644 --- a/app/templates/views/send-test.html +++ b/app/templates/views/send-test.html @@ -3,12 +3,12 @@ {% from "components/file-upload.html" import file_upload %} {% from "components/table.html" import list_table, field, text_field, index_field, index_field_heading %} -{% block page_title %} +{% block service_page_title %} {% if request.args['help'] %} Example text message {% else %} Send yourself a test - {% endif %} – GOV.UK Notify + {% endif %} {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/send.html b/app/templates/views/send.html index 847be9b0a..8a2621d8a 100644 --- a/app/templates/views/send.html +++ b/app/templates/views/send.html @@ -3,8 +3,8 @@ {% from "components/file-upload.html" import file_upload %} {% from "components/table.html" import list_table, text_field, index_field, index_field_heading %} -{% block page_title %} - Upload recipients – GOV.UK Notify +{% block service_page_title %} + Upload recipients {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html index e23a50b4e..d45f3b4e7 100644 --- a/app/templates/views/service-settings.html +++ b/app/templates/views/service-settings.html @@ -3,8 +3,8 @@ {% from "components/browse-list.html" import browse_list %} {% from "components/table.html" import mapping_table, row, text_field, edit_field, field %} -{% block page_title %} - Settings – GOV.UK Notify +{% block service_page_title %} + Settings {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/service-settings/confirm.html b/app/templates/views/service-settings/confirm.html index ffe96bc2b..72b372e98 100644 --- a/app/templates/views/service-settings/confirm.html +++ b/app/templates/views/service-settings/confirm.html @@ -2,8 +2,8 @@ {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} -{% block page_title %} - {{ heading }} – GOV.UK Notify +{% block service_page_title %} + {{ heading }} {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/service-settings/delete.html b/app/templates/views/service-settings/delete.html index 04d79ebd3..5880c6481 100644 --- a/app/templates/views/service-settings/delete.html +++ b/app/templates/views/service-settings/delete.html @@ -1,8 +1,8 @@ {% extends "withnav_template.html" %} {% from "components/page-footer.html" import page_footer %} -{% block page_title %} - Delete service – GOV.UK Notify +{% block service_page_title %} + Delete service {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/service-settings/name.html b/app/templates/views/service-settings/name.html index 395bf36d9..419cd7d03 100644 --- a/app/templates/views/service-settings/name.html +++ b/app/templates/views/service-settings/name.html @@ -2,8 +2,8 @@ {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} -{% block page_title %} - Change your service name – GOV.UK Notify +{% block service_page_title %} + Change your service name {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/service-settings/request-to-go-live.html b/app/templates/views/service-settings/request-to-go-live.html index 5ae0d5baf..e6fe09188 100644 --- a/app/templates/views/service-settings/request-to-go-live.html +++ b/app/templates/views/service-settings/request-to-go-live.html @@ -4,8 +4,8 @@ {% from "components/page-footer.html" import page_footer %} {% from "components/banner.html" import banner_wrapper %} -{% block page_title %} - Request to go live – GOV.UK Notify +{% block service_page_title %} + Request to go live {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/service-settings/set-branding-and-org.html b/app/templates/views/service-settings/set-branding-and-org.html index 34c78da8f..16d353d61 100644 --- a/app/templates/views/service-settings/set-branding-and-org.html +++ b/app/templates/views/service-settings/set-branding-and-org.html @@ -2,8 +2,8 @@ {% from "components/radios.html" import radios, branding_radios %} {% from "components/page-footer.html" import page_footer %} -{% block page_title %} - Set branding and organisation – GOV.UK Notify +{% block service_page_title %} + Set branding and organisation {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/service-settings/set-reply-to-email.html b/app/templates/views/service-settings/set-reply-to-email.html index 1de3cb77d..b31071380 100644 --- a/app/templates/views/service-settings/set-reply-to-email.html +++ b/app/templates/views/service-settings/set-reply-to-email.html @@ -2,8 +2,8 @@ {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} -{% block page_title %} - Email reply to address – GOV.UK Notify +{% block service_page_title %} + Email reply to address {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/service-settings/set-sms-sender.html b/app/templates/views/service-settings/set-sms-sender.html index 3bc58eeb3..19316b83e 100644 --- a/app/templates/views/service-settings/set-sms-sender.html +++ b/app/templates/views/service-settings/set-sms-sender.html @@ -2,8 +2,8 @@ {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} -{% block page_title %} - Set text message sender name – GOV.UK Notify +{% block service_page_title %} + Text message sender {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/signin.html b/app/templates/views/signin.html index 6f46634af..5b2ab7168 100644 --- a/app/templates/views/signin.html +++ b/app/templates/views/signin.html @@ -2,8 +2,8 @@ {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} -{% block page_title %} - Sign in – GOV.UK Notify +{% block per_page_title %} + Sign in {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/styleguide.html b/app/templates/views/styleguide.html index 650ec5254..bcb4a34bc 100644 --- a/app/templates/views/styleguide.html +++ b/app/templates/views/styleguide.html @@ -10,8 +10,8 @@ {% from "components/api-key.html" import api_key %} {% from "components/list.html" import formatted_list %} -{% block page_title %} - Styleguide – GOV.UK Notify +{% block per_page_title %} + Styleguide {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/support/bat-phone.html b/app/templates/views/support/bat-phone.html index 751c27cae..f21ea59c2 100644 --- a/app/templates/views/support/bat-phone.html +++ b/app/templates/views/support/bat-phone.html @@ -2,8 +2,8 @@ {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} -{% block page_title %} - Out of hours emergencies – GOV.UK Notify +{% block per_page_title %} + Out of hours emergencies {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/support/index.html b/app/templates/views/support/index.html index 5081b9f39..2fbd7a8a8 100644 --- a/app/templates/views/support/index.html +++ b/app/templates/views/support/index.html @@ -2,8 +2,8 @@ {% from "components/radios.html" import radios %} {% from "components/page-footer.html" import page_footer %} -{% block page_title %} - Support – GOV.UK Notify +{% block per_page_title %} + Support {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/support/problem.html b/app/templates/views/support/problem.html index e171d13cb..de39efb08 100644 --- a/app/templates/views/support/problem.html +++ b/app/templates/views/support/problem.html @@ -3,8 +3,8 @@ {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} -{% block page_title %} - Report a problem – GOV.UK Notify +{% block per_page_title %} + Report a problem {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/support/question.html b/app/templates/views/support/question.html index 6b0b63074..91254c12b 100644 --- a/app/templates/views/support/question.html +++ b/app/templates/views/support/question.html @@ -2,8 +2,8 @@ {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} -{% block page_title %} - Ask a question or give feedback – GOV.UK Notify +{% block per_page_title %} + Ask a question or give feedback {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/support/thanks.html b/app/templates/views/support/thanks.html index 3b85b4fae..45c1a5ea5 100644 --- a/app/templates/views/support/thanks.html +++ b/app/templates/views/support/thanks.html @@ -2,8 +2,8 @@ {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} -{% block page_title %} - Thanks for contacting us – GOV.UK Notify +{% block per_page_title %} + Thanks for contacting us {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/support/triage.html b/app/templates/views/support/triage.html index 475a5fea9..cce577fa8 100644 --- a/app/templates/views/support/triage.html +++ b/app/templates/views/support/triage.html @@ -2,8 +2,8 @@ {% from "components/radios.html" import radios %} {% from "components/page-footer.html" import page_footer %} -{% block page_title %} - Feedback – GOV.UK Notify +{% block per_page_title %} + Feedback {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/temp-history.html b/app/templates/views/temp-history.html index f8a4ba7f6..8d0433c36 100644 --- a/app/templates/views/temp-history.html +++ b/app/templates/views/temp-history.html @@ -2,8 +2,8 @@ {% from "components/page-footer.html" import page_footer %} {% from "components/table.html" import list_table, field %} -{% block page_title %} -History – GOV.UK Notify +{% block service_page_title %} +Service and API key history {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/templates/breaking-change.html b/app/templates/views/templates/breaking-change.html index 6a94248c6..6ca08fa25 100644 --- a/app/templates/views/templates/breaking-change.html +++ b/app/templates/views/templates/breaking-change.html @@ -4,8 +4,8 @@ {% from "components/table.html" import list_table, text_field, index_field, index_field_heading %} {% from "components/list.html" import list_of_placeholders %} -{% block page_title %} - GOV.UK Notify +{% block service_page_title %} + Confirm changes {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/templates/choose.html b/app/templates/views/templates/choose.html index 028152e80..0510a6932 100644 --- a/app/templates/views/templates/choose.html +++ b/app/templates/views/templates/choose.html @@ -1,7 +1,7 @@ {% extends "withnav_template.html" %} -{% block page_title %} - {{ page_heading }} – GOV.UK Notify +{% block service_page_title %} + {{ page_heading }} {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/templates/choose_history.html b/app/templates/views/templates/choose_history.html index 9d112a6cd..d7295859d 100644 --- a/app/templates/views/templates/choose_history.html +++ b/app/templates/views/templates/choose_history.html @@ -1,7 +1,7 @@ {% extends "withnav_template.html" %} -{% block page_title %} - Previous versions – GOV.UK Notify +{% block service_page_title %} + Previous versions {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/templates/template.html b/app/templates/views/templates/template.html index 7a6266f13..3e281be99 100644 --- a/app/templates/views/templates/template.html +++ b/app/templates/views/templates/template.html @@ -2,8 +2,8 @@ {% from "components/page-footer.html" import page_footer %} {% from "components/textbox.html" import textbox %} -{% block page_title %} - {{ template.name }} – GOV.UK Notify +{% block service_page_title %} + {{ template.name }} {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/templates/template_history.html b/app/templates/views/templates/template_history.html index c726d9bf1..fb3236b4d 100644 --- a/app/templates/views/templates/template_history.html +++ b/app/templates/views/templates/template_history.html @@ -2,8 +2,8 @@ {% from "components/page-footer.html" import page_footer %} {% from "components/textbox.html" import textbox %} -{% block page_title %} - {{ template.name }} – GOV.UK Notify +{% block service_page_title %} + {{ template.name }} {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/terms-of-use.html b/app/templates/views/terms-of-use.html index f4d576421..33feef0b3 100644 --- a/app/templates/views/terms-of-use.html +++ b/app/templates/views/terms-of-use.html @@ -1,8 +1,8 @@ {% extends "withoutnav_template.html" %} {% from "components/banner.html" import banner_wrapper %} -{% block page_title %} -Terms of use – GOV.UK Notify +{% block per_page_title %} +Terms of use {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/text-not-received-2.html b/app/templates/views/text-not-received-2.html index 3a49f39a7..916a9d35e 100644 --- a/app/templates/views/text-not-received-2.html +++ b/app/templates/views/text-not-received-2.html @@ -1,7 +1,7 @@ {% extends "withoutnav_template.html" %} -{% block page_title %} -Check your mobile number – GOV.UK Notify +{% block per_page_title %} +Check your mobile number {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/text-not-received.html b/app/templates/views/text-not-received.html index 4ee286f08..7730ac917 100644 --- a/app/templates/views/text-not-received.html +++ b/app/templates/views/text-not-received.html @@ -2,8 +2,8 @@ {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} -{% block page_title %} -Check your mobile number – GOV.UK Notify +{% block per_page_title %} +Check your mobile number {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/trial-mode.html b/app/templates/views/trial-mode.html index a7de3fb7c..73fe27c11 100644 --- a/app/templates/views/trial-mode.html +++ b/app/templates/views/trial-mode.html @@ -1,7 +1,7 @@ {% extends "withoutnav_template.html" %} -{% block page_title %} - Trial mode – GOV.UK Notify +{% block per_page_title %} + Trial mode {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/two-factor.html b/app/templates/views/two-factor.html index 6be75c039..73c7d9111 100644 --- a/app/templates/views/two-factor.html +++ b/app/templates/views/two-factor.html @@ -3,8 +3,8 @@ {% from "components/checkbox.html" import checkbox %} {% from "components/page-footer.html" import page_footer %} -{% block page_title %} - Text verification – GOV.UK Notify +{% block per_page_title %} + Text verification {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/usage.html b/app/templates/views/usage.html index 0059ed939..8876b222f 100644 --- a/app/templates/views/usage.html +++ b/app/templates/views/usage.html @@ -4,8 +4,8 @@ {% extends "withnav_template.html" %} -{% block page_title %} - Usage – GOV.UK Notify +{% block service_page_title %} + Usage {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/user-profile.html b/app/templates/views/user-profile.html index d1e3da880..e3f7da255 100644 --- a/app/templates/views/user-profile.html +++ b/app/templates/views/user-profile.html @@ -1,8 +1,8 @@ {% extends "withoutnav_template.html" %} {% from "components/table.html" import list_table, row, field %} -{% block page_title %} - Your profile – GOV.UK Notify +{% block per_page_title %} + Your profile {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/verification-not-received.html b/app/templates/views/verification-not-received.html index 7b322f087..bf2fe74e6 100644 --- a/app/templates/views/verification-not-received.html +++ b/app/templates/views/verification-not-received.html @@ -1,7 +1,7 @@ {% extends "withoutnav_template.html" %} -{% block page_title %} - Resend verification code – GOV.UK Notify +{% block per_page_title %} + Resend verification code {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/verify-mobile.html b/app/templates/views/verify-mobile.html index 381268f5c..5a400807d 100644 --- a/app/templates/views/verify-mobile.html +++ b/app/templates/views/verify-mobile.html @@ -1,7 +1,7 @@ {% extends "withoutnav_template.html" %} -{% block page_title %} -Confirm your mobile number – GOV.UK Notify +{% block per_page_title %} +Confirm your mobile number {% endblock %} {% block maincolumn_content %} diff --git a/app/templates/withnav_template.html b/app/templates/withnav_template.html index 7c4c44223..cf736fa68 100644 --- a/app/templates/withnav_template.html +++ b/app/templates/withnav_template.html @@ -1,5 +1,9 @@ {% extends "admin_template.html" %} +{% block per_page_title %} + {% block service_page_title %}{% endblock %} – {{ current_service.name }} +{% endblock %} + {% block fullwidth_content %}