Fix page titles (#313)

This switches to using `{% set pageName %}` on all pages instead of `{%
block pageTitle %}`, so that the service name is appended as `<title>{{
pageName %}} - NHS Record a vaccinations</title>`.

Author: frankieroberto

app/views/accessibility-statement.html

@@ -1,15 +1,13 @@
 {% extends 'layout.html' %}
 
-{% block pageTitle %}
-  Accessibility statement
-{% endblock %}
+{% set pageName = "Accessibility statement" %}
 
 {% block content %}
   <div class="nhsuk-grid-row">
 
     <div class="nhsuk-grid-column-two-thirds">
 
-      <h1>Accessibility statement</h1>
+      <h1>{{ pageName }}</h1>
 
         <p>This accessibility statement applies to the Record a vaccination service
             (<a href="https://www.ravs.england.nhs.uk">www.ravs.england.nhs.uk</a>)</p>
@@ -37,7 +35,7 @@ <h2>Give feedback and report accessibility problems</h2>
 
 
     <h2>Enforcement procedure</h2>
-    <p>The Equality and Human Rights Commission (EHRC) is responsible for enforcing the Public Sector Bodies (Websites and Mobile Applications) (No. 2) Accessibility Regulations 2018 (the ‘accessibility regulations’).</p> 
+    <p>The Equality and Human Rights Commission (EHRC) is responsible for enforcing the Public Sector Bodies (Websites and Mobile Applications) (No. 2) Accessibility Regulations 2018 (the ‘accessibility regulations’).</p>
     <p>If you’re not happy with how we respond to your complaint, <a href="https://www.equalityadvisoryservice.com/">contact the Equality Advisory and Support Service (EASS)</a>.</p>
 
     <h2>Technical information about this website’s accessibility</h2>

app/views/alerts/deactivated.html

@@ -1,8 +1,6 @@
 {% extends 'layout.html' %}
 
-{% block pageTitle %}
-  Record a vaccination
-{% endblock %}
+{% set pageName = "Organisation name has been deactivated" %}
 
 {% block header %}
   {% include "includes/header-logged-out.html" %}
@@ -20,14 +18,14 @@
             <h1 class="nhsuk-panel__title" style="color:#212b32;">
             Organisation name has been deactivated
             </h1>
-          
+
             <div class="nhsuk-panel__body" style="color:#212b32;">
             <p>This means you can no longer record vaccinations for this organisation.</p>
             <p>Until [date] you will still be able to access other parts of the Record a vaccination service.</p>
             <p>After [date] you will no longer have access to the service for ((Organisation name)).</p>
             </div>
 
-                    
+
             <br><br>
 
 
@@ -41,7 +39,7 @@ <h1 class="nhsuk-panel__title" style="color:#212b32;">
 
           </div>
 
-        
+
 
 
 

app/views/alerts/high-alert.html

@@ -1,8 +1,6 @@
 {% extends 'layout.html' %}
 
-{% block pageTitle %}
-  Record a vaccination
-{% endblock %}
+{% set pageName = "New section to record vaccinations" %}
 
 {% block header %}
   {% include "includes/header-logged-out.html" %}
@@ -20,16 +18,16 @@
             <h1 class="nhsuk-panel__title" style="color:#212b32;">
               New section to record vaccinations
             </h1>
-          
+
             <div class="nhsuk-panel__body" style="color:#212b32;">
-                We've updated the user journey for recording vaccinations. From now on, select 'Record vaccinations' from the header to start recording a vaccination. 
+                We've updated the user journey for recording vaccinations. From now on, select 'Record vaccinations' from the header to start recording a vaccination.
             </div>
 
             <br>
 
             <a href="/updates" style="color:#005eb8;">Example link</a>
-            
-            
+
+
             <br><br>
 
 
@@ -43,7 +41,7 @@ <h1 class="nhsuk-panel__title" style="color:#212b32;">
 
           </div>
 
-        
+
 
 
 

app/views/alerts/inset-2.html

@@ -1,8 +1,6 @@
 {% extends 'layout.html' %}
 
-{% block pageTitle %}
-  {{ currentOrganisation.name }} – Home
-{% endblock %}
+{% set pageName = currentOrganisation.name + " - Home" %}
 
 {% set currentSection = "home" %}
 
@@ -33,9 +31,9 @@ <h2 class="nhsuk-heading-m">Example heading</h2>
       <p>You have not yet recorded a vaccination.</p>
 
       <p class="nhsuk-body"><a href="/vaccines/choose-site">Add vaccines</a></p>
-  
+
       <p class="nhsuk-body"><a href="/user-admin/add-user">Add users</a></p>
-      
+
       <p class="nhsuk-body"><a href="/find-a-patient">Find a patient</a></p>
 
       <p>Find help and guidance at <a href="/reports">guide.ravs.england.nhs.uk</a></p>
@@ -85,7 +83,7 @@ <h2 class="nhsuk-heading-m">Total vaccinations</h2>
     </li>
 
 </ul>
-    
+
 
     </div>
   </div>

app/views/alerts/new.html

@@ -1,8 +1,6 @@
 {% extends 'layout.html' %}
 
-{% block pageTitle %}
-  Add batch
-{% endblock %}
+{% set pageName = "Add batch" %}
 
 {% set currentSection = "vaccines" %}
 
@@ -17,7 +15,7 @@
   <div class="nhsuk-grid-row">
     <div class="nhsuk-grid-column-two-thirds">
 
-      <h1 class="nhsuk-heading-l">Add batch</h1>
+      <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
 
       <form action="/vaccines/check" method="post" novalidate="true">
 
@@ -59,7 +57,7 @@ <h1 class="nhsuk-heading-l">Add batch</h1>
 
           {{ radios({
             "idPrefix": "pack-type",
-            
+
             "name": "packType",
             "fieldset": {
               "legend": {
@@ -81,7 +79,7 @@ <h1 class="nhsuk-heading-l">Add batch</h1>
             ]
           }) }}
 
-        
+
 
           {{ button({
             "text": "Continue"

app/views/alerts/notification.html

@@ -1,8 +1,6 @@
 {% extends 'layout.html' %}
 
-{% block pageTitle %}
-  Vaccines
-{% endblock %}
+{% set pageName = "Vaccines" %}
 
 {% set currentSection = "vaccines" %}
 
@@ -19,7 +17,7 @@
 
       {% include "_test.html" %}
 
-      <h1 class="nhsuk-heading-xl">Vaccines</h1>
+      <h1 class="nhsuk-heading-xl">{{ pageName }}</h1>
 
       <p class="nhsuk-body-l">Add and edit your vaccines for your organisation.</p>
 

app/views/button-states.html

@@ -1,14 +1,12 @@
 {% extends 'layout.html' %}
 
-{% block pageTitle %}
-  Button states
-{% endblock %}
+{% set pageName = "Button states" %}
 
 {% block content %}
   <div class="nhsuk-grid-row">
     <div class="nhsuk-grid-column-two-thirds">
 
-      <h1 class="nhsuk-heading-l">Button states</h1>
+      <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
 
 
       <h2 class="nhsuk-heading-m">Not yet pressed</h2>

app/views/contact-us.html

@@ -1,14 +1,13 @@
 {% extends 'layout.html' %}
 
-{% block pageTitle %}
-  Contact us
-{% endblock %}
+{% set pageName = "Contact us" %}
+
 
 {% block content %}
   <div class="nhsuk-grid-row">
     <div class="nhsuk-grid-column-two-thirds">
 
-      <h1 class="nhsuk-heading-xl">Contact us</h1>
+      <h1 class="nhsuk-heading-xl">{{ pageName }}</h1>
 
       <p>Telephone: <b>0121 611 0187</b> (select option 3)<br>
       Email: <a href="#">[email protected]</a></p>

app/views/email-invite.html

@@ -1,8 +1,6 @@
 {% extends 'layout.html' %}
 
-{% block pageTitle %}
-  RAVS (Record a vaccination service) Get started
-{% endblock %}
+{% set pageName = "RAVS (Record a vaccination service) Get started" %}
 
 {% block header %}
 {% endblock %}

app/views/home/index.html

@@ -1,8 +1,6 @@
 {% extends 'layout.html' %}
 
-{% block pageTitle %}
-  {{ currentOrganisation.name }} – Home
-{% endblock %}
+{% set pageName = currentOrganisation.name + " - Home" %}
 
 {% set currentSection = "home" %}