Include service name in page <title>

In pages specific to a service (e.g. dashboard and sub pages) the title
needs to distinguish which service it applies to. This is mainly to give
context to screen reader users who could be managing multiple services.

Implementing this uses template inheritance:

`page_title` includes `per_page_title` includes `service_page_title`

‘GOV.UK Notify’ is inserted into every page title.

Pages that set `service_page_title` get the service name inserted too.

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 %}

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 %}
+{% block per_page_title %}
-  {{heading}} – GOV.UK Notify
+  {{ heading }}
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block per_page_title %}
-  All service – GOV.UK Notify
+  All services
 {% endblock %}
 
 {% block maincolumn_content %}
@@ -13,4 +13,4 @@
 
   {{ browse_list(services) }}
 
-{% endblock %}
+{% endblock %}

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 %}
+{% block service_page_title %}
-  API integration – GOV.UK Notify
+  Documentation
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block service_page_title %}
-  API integration – GOV.UK Notify
+  API integration
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block service_page_title %}
-  API integration – GOV.UK Notify
+  API keys
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block service_page_title %}
-  Create an API key – GOV.UK Notify
+  Create an API key
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block service_page_title %}
-  Revoke API key – GOV.UK Notify
+  Revoke API key
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block service_page_title %}
-  New API key – GOV.UK Notify
+  New API key
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block service_page_title %}
-  API integration – GOV.UK Notify
+  Whitelist
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
     <div class="grid-row">
       <div class="column-two-thirds">

app/templates/views/change-email-continue.html

@@ -1,7 +1,7 @@
 {% extends "withoutnav_template.html" %}
 
-{% block page_title %}
+{% block per_page_title %}
-  Check your email – GOV.UK Notify
+  Check your email
 {% endblock %}
 
 {% block maincolumn_content %}
@@ -10,4 +10,4 @@
   <p>An email has been sent to {{ new_email }}.</p>
   <p>Click the link in the email to confirm the change to your email address.</p>
 
-{% endblock %}
+{% endblock %}

app/templates/views/check.html

@@ -14,8 +14,8 @@
   </p>
 {% endmacro %}
 
-{% block page_title %}
+{% block service_page_title %}
-  {{ "Error" if errors else "Preview" }} – GOV.UK Notify
+  {{ "Error" if errors else "Preview" }}
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block per_page_title %}
-  Choose service – GOV.UK Notify
+  Choose service
 {% endblock %}
 
 {% block maincolumn_content %}

app/templates/views/cookies.html

@@ -1,7 +1,7 @@
 {% extends "withoutnav_template.html" %}
 
-{% block page_title %}
+{% block per_page_title %}
-  Cookies – GOV.UK Notify
+  Cookies
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block service_page_title %}
-  Dashboard – GOV.UK Notify
+  Dashboard
 {% endblock %}
 
 {% block maincolumn_content %}

app/templates/views/delivery-and-failure.html

@@ -1,7 +1,7 @@
 {% extends "withoutnav_template.html" %}
 
-{% block page_title %}
+{% block per_page_title %}
-Delivery and failure – GOV.UK Notify
+Delivery and failure
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block per_page_title %}
-Design patterns and content guidance – GOV.UK Notify
+Design patterns and content guidance
 {% endblock %}
 
 {% block maincolumn_content %}

app/templates/views/documentation.html

@@ -1,7 +1,7 @@
 {% extends "withoutnav_template.html" %}
 
-{% block page_title %}
+{% block per_page_title %}
-  API documentation – GOV.UK Notify
+  API documentation
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block service_page_title %}
-  {{ heading_action }} email template – GOV.UK Notify
+  {{ heading_action }} email template
 {% endblock %}
 
 {% block maincolumn_content %}
@@ -33,7 +33,7 @@
         <aside class="column-whole">
           {% include "partials/templates/guidance-formatting.html" %}
           {% include "partials/templates/guidance-personalisation.html" %}
-          {% include "partials/templates/guidance-optional-content.html" %}         
+          {% include "partials/templates/guidance-optional-content.html" %}
           {% include "partials/templates/guidance-links.html" %}
         </aside>
       </div>

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 %}
+{% block service_page_title %}
-  {{ heading_action }} letter template – GOV.UK Notify
+  {{ heading_action }} letter template
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block service_page_title %}
-  {{ heading_action }} text message template – GOV.UK Notify
+  {{ heading_action }} text message template
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block service_page_title %}
-Manage users – GOV.UK Notify
+Manage users
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block per_page_title %}
-Create a new password – GOV.UK Notify
+Create a new password
 {% endblock %}
 
 {% block maincolumn_content %}

app/templates/views/information-security.html

@@ -1,8 +1,8 @@
 {% from "components/banner.html" import banner_wrapper %}
 {% extends "withoutnav_template.html" %}
 
-{% block page_title %}
+{% block per_page_title %}
-Information security guidelines – GOV.UK Notify
+Information security guidelines
 {% endblock %}
 
 {% block maincolumn_content %}
@@ -139,7 +139,7 @@ Information security guidelines – GOV.UK Notify
 
       <p>If you need to send someone a file, make the file available within your service, then link to it.</p>
 
- 
+
       <h3 class="heading-small" id="guideline-name">Include the user’s name – it makes phishing more difficult</h3>
 
       <p>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.</p>
@@ -152,10 +152,10 @@ Information security guidelines – GOV.UK Notify
 
       <p>TLS makes sure that no-one can intercept your emails.</p>
     </section>
-    
+
       <section id="examples">
       <h2 class="heading-medium">Examples</h2>
-      
+
         <h3 class="heading-small">Example of an appointment reminder</h3>
         <p>“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.”</p>
         <p>This is a good example because:</p>
@@ -167,8 +167,8 @@ Information security guidelines – GOV.UK Notify
             <li>users have to sign in to change the appointment time, making it harder for an attacker to know what their appointment time is</li>
             <li>the topic is something the user is familiar with</li>
         </ul>
-      
+
-    
+
      <h3 class="heading-small">Example to add a photo to an environmental permit</h3>
         <p>“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.”</p>
         <p>This is a good example because:</p>
@@ -180,7 +180,7 @@ Information security guidelines – GOV.UK Notify
             <li>it shows users what to do if the message doesn't apply to them</li>
         </ul>
        </section>
-    
+
     <section id="you-can-do-more">
       <h2 class="heading-medium">You can do more if you want to</h2>
 

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 %}
+{% block per_page_title %}
-  Integration testing - GOV.UK Notify
+  Integration testing
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block service_page_title %}
-Manage users – GOV.UK Notify
+Manage users
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block service_page_title %}
-  {{ uploaded_file_name }} – GOV.UK Notify
+  {{ uploaded_file_name }}
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block service_page_title %}
-  Notifications activity – GOV.UK Notify
+  Uploaded files
 {% endblock %}
 
 {% block maincolumn_content %}

app/templates/views/manage-users.html

@@ -11,8 +11,8 @@
   'caption_visible': True
 } %}
 
-{% block page_title %}
+{% block service_page_title %}
-Manage users – GOV.UK Notify
+Manage users
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block per_page_title %}
-  Create a new password – GOV.UK Notify
+  Create a new password
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block service_page_title %}
-  {{ message_count_label(99, message_type, suffix='') | capitalize }} – GOV.UK Notify
+  {{ message_count_label(99, message_type, suffix='') | capitalize }}
 {% endblock %}
 
 {% block maincolumn_content %}

app/templates/views/password-reset-sent.html

@@ -1,7 +1,7 @@
 {% extends "withoutnav_template.html" %}
 
-{% block page_title %}
+{% block per_page_title %}
-GOV.UK Notify
+Check your email
 {% endblock %}
 
 {% block maincolumn_content %}

app/templates/views/platform-admin.html

@@ -80,8 +80,8 @@
 {% endmacro %}
 
 
-{% block page_title %}
+{% block per_page_title %}
-  Platform admin – GOV.UK Notify
+  Platform admin
 {% endblock %}
 
 {% block maincolumn_content %}

app/templates/views/pricing.html

@@ -1,7 +1,7 @@
 {% extends "withoutnav_template.html" %}
 
-{% block page_title %}
+{% block per_page_title %}
-  Pricing – GOV.UK Notify
+  Pricing
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block per_page_title %}
-Provider - {{provider.display_name}} – GOV.UK Notify
+Provider - {{provider.display_name}}
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block per_page_title %}
-Providers – GOV.UK Notify
+Providers
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block per_page_title %}
-Create an account – GOV.UK Notify
+Create an account
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block per_page_title %}
-Create an account – GOV.UK Notify
+Create an account
 {% endblock %}
 
 {% block maincolumn_content %}

app/templates/views/registration-continue.html

@@ -1,7 +1,7 @@
 {% extends "withoutnav_template.html" %}
 
-{% block page_title %}
+{% block per_page_title %}
-  Check your email – GOV.UK Notify
+  Check your email
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block per_page_title %}
-  Check your email – GOV.UK Notify
+  Check your email
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block service_page_title %}
-  API info – GOV.UK Notify
+  API info
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}

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 %}
+{% block service_page_title %}
-  Upload recipients – GOV.UK Notify
+  Upload recipients
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block service_page_title %}
-  Settings – GOV.UK Notify
+  Settings
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block service_page_title %}
-  {{ heading }} – GOV.UK Notify
+  {{ heading }}
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block service_page_title %}
-  Delete service – GOV.UK Notify
+  Delete service
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block service_page_title %}
-  Change your service name – GOV.UK Notify
+  Change your service name
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block service_page_title %}
-  Request to go live – GOV.UK Notify
+  Request to go live
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block service_page_title %}
-  Set branding and organisation – GOV.UK Notify
+  Set branding and organisation
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block service_page_title %}
-  Email reply to address – GOV.UK Notify
+  Email reply to address
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block service_page_title %}
-  Set text message sender name – GOV.UK Notify
+  Text message sender
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block per_page_title %}
-  Sign in – GOV.UK Notify
+  Sign in
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block per_page_title %}
-  Styleguide – GOV.UK Notify
+  Styleguide
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block per_page_title %}
-  Out of hours emergencies – GOV.UK Notify
+  Out of hours emergencies
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block per_page_title %}
-  Support – GOV.UK Notify
+  Support
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block per_page_title %}
-  Report a problem – GOV.UK Notify
+  Report a problem
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block per_page_title %}
-  Ask a question or give feedback – GOV.UK Notify
+  Ask a question or give feedback
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block per_page_title %}
-  Thanks for contacting us – GOV.UK Notify
+  Thanks for contacting us
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block per_page_title %}
-  Feedback – GOV.UK Notify
+  Feedback
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block service_page_title %}
-History – GOV.UK Notify
+Service and API key history
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block service_page_title %}
-  GOV.UK Notify
+  Confirm changes
 {% endblock %}
 
 {% block maincolumn_content %}

app/templates/views/templates/choose.html

@@ -1,7 +1,7 @@
 {% extends "withnav_template.html" %}
 
-{% block page_title %}
+{% block service_page_title %}
-  {{ page_heading }} – GOV.UK Notify
+  {{ page_heading }}
 {% endblock %}
 
 {% block maincolumn_content %}

app/templates/views/templates/choose_history.html

@@ -1,7 +1,7 @@
 {% extends "withnav_template.html" %}
 
-{% block page_title %}
+{% block service_page_title %}
-  Previous versions – GOV.UK Notify
+  Previous versions
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block service_page_title %}
-  {{ template.name }} – GOV.UK Notify
+  {{ template.name }}
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block service_page_title %}
-  {{ template.name }} – GOV.UK Notify
+  {{ template.name }}
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block per_page_title %}
-Terms of use – GOV.UK Notify
+Terms of use
 {% endblock %}
 
 {% block maincolumn_content %}

app/templates/views/text-not-received-2.html

@@ -1,7 +1,7 @@
 {% extends "withoutnav_template.html" %}
 
-{% block page_title %}
+{% block per_page_title %}
-Check your mobile number – GOV.UK Notify
+Check your mobile number
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block per_page_title %}
-Check your mobile number – GOV.UK Notify
+Check your mobile number
 {% endblock %}
 
 {% block maincolumn_content %}

app/templates/views/trial-mode.html

@@ -1,7 +1,7 @@
 {% extends "withoutnav_template.html" %}
 
-{% block page_title %}
+{% block per_page_title %}
-  Trial mode – GOV.UK Notify
+  Trial mode
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block per_page_title %}
-  Text verification – GOV.UK Notify
+  Text verification
 {% endblock %}
 
 {% block maincolumn_content %}

app/templates/views/usage.html

@@ -4,8 +4,8 @@
 
 {% extends "withnav_template.html" %}
 
-{% block page_title %}
+{% block service_page_title %}
-  Usage – GOV.UK Notify
+  Usage
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
+{% block per_page_title %}
-  Your profile – GOV.UK Notify
+  Your profile
 {% endblock %}
 
 {% block maincolumn_content %}

app/templates/views/verification-not-received.html

@@ -1,7 +1,7 @@
 {% extends "withoutnav_template.html" %}
 
-{% block page_title %}
+{% block per_page_title %}
-  Resend verification code – GOV.UK Notify
+  Resend verification code
 {% endblock %}
 
 {% block maincolumn_content %}

app/templates/views/verify-mobile.html

@@ -1,7 +1,7 @@
 {% extends "withoutnav_template.html" %}
 
-{% block page_title %}
+{% block per_page_title %}
-Confirm your  mobile number – GOV.UK Notify
+Confirm your mobile number
 {% endblock %}
 
 {% block maincolumn_content %}

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 %}
   <div id="content">
     <div class="navigation-service">