Merge pull request #1150 from alphagov/page-title-fixes-missed

Fix page titles that didn’t get fixed before

app/templates/error/400.html

@@ -1,5 +1,5 @@
 {% extends "withoutnav_template.html" %}
-{% block page_title %}Bad Request{% endblock %}
+{% block per_page_title %}Bad Request{% endblock %}
 {% block maincolumn_content %}
 <div class="grid-row">
     <div class="column-two-thirds">

app/templates/error/401.html

@@ -1,5 +1,5 @@
 {% extends "withoutnav_template.html" %}
-{% block page_title %}Unauthorized{% endblock %}
+{% block per_page_title %}Unauthorized{% endblock %}
 {% block maincolumn_content %}
   <div class="grid-row">
     <div class="column-two-thirds">

app/templates/error/403.html

@@ -1,5 +1,5 @@
 {% extends "withoutnav_template.html" %}
-{% block page_title %}Forbidden{% endblock %}
+{% block per_page_title %}Forbidden{% endblock %}
 {% block maincolumn_content %}
     <div class="grid-row">
       <div class="column-two-thirds">

app/templates/error/404.html

@@ -1,5 +1,5 @@
 {% extends "withoutnav_template.html" %}
-{% block page_title %}Page not found{% endblock %}
+{% block per_page_title %}Page not found{% endblock %}
 {% block maincolumn_content %}
     <div class="grid-row">
       <div class="column-two-thirds">

app/templates/error/410.html

@@ -1,5 +1,5 @@
 {% extends "withoutnav_template.html" %}
-{% block page_title %}Page not found{% endblock %}
+{% block per_page_title %}Page not found{% endblock %}
 {% block maincolumn_content %}
     <div class="grid-row">
       <div class="column-two-thirds">

app/templates/error/500.html

@@ -1,5 +1,5 @@
 {% extends "withoutnav_template.html" %}
-{% block page_title %}Server error{% endblock %}
+{% block per_page_title %}Server error{% endblock %}
 {% block maincolumn_content %}
   <div class="grid-row">
     <div class="column-two-thirds">

app/templates/views/dashboard/all-template-statistics.html

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

app/templates/views/dashboard/monthly.html

@@ -5,10 +5,9 @@
 
 {% extends "withnav_template.html" %}
 
-{% block page_title %}
+{% block service_page_title %}
   Activity breakdown
   {{ selected_year }} to {{ selected_year + 1 }} financial year
-  – GOV.UK Notify
 {% endblock %}
 
 {% block maincolumn_content %}

app/templates/views/user-profile/authenticate.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 %}
-GOV.UK Notify | Service settings
+  Change your {{ thing }}
 {% endblock %}
 
 {% block maincolumn_content %}

app/templates/views/user-profile/change-password.html

@@ -2,13 +2,13 @@
 {% from "components/textbox.html" import textbox %}
 {% from "components/page-footer.html" import page_footer %}
 
-{% block page_title %}
+{% block per_page_title %}
-GOV.UK Notify | Service settings
+  Change your password
 {% endblock %}
 
 {% block maincolumn_content %}
 
-  <h1 class="heading-large">Change your password</h1>
+    <h1 class="heading-large">Change your password</h1>
 
   <div class="grid-row">
     <div class="column-three-quarters">

app/templates/views/user-profile/change.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 %}
-GOV.UK Notify | Service settings
+  Change your {{ thing }}
 {% endblock %}
 
 {% block maincolumn_content %}

app/templates/views/user-profile/confirm.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 %}
-GOV.UK Notify | Service settings
+  Change your {{ thing }}
 {% endblock %}
 
 {% block maincolumn_content %}