From dcef3d7a7a60525caf8b956a41bc7ee4b3a7aa3d Mon Sep 17 00:00:00 2001 From: Daniel Liburd Date: Wed, 13 Sep 2023 11:43:23 +0100 Subject: [PATCH 1/3] Change formatting of page titles Page titles should be displayed first as it allows you to better discern a tab's current page if it's not active and also aids assistive technologies by calling out the page name first. --- integration_tests/tests/temporary-accommodation/cookies.cy.ts | 2 +- server/views/applications/confirm.njk | 2 +- server/views/applications/index.njk | 2 +- server/views/applications/new.njk | 2 +- .../pages/check-your-answers/check-your-answers/review.njk | 2 +- server/views/applications/pages/layout.njk | 2 +- server/views/applications/people/confirm.njk | 2 +- server/views/applications/people/selectOffence.njk | 2 +- server/views/applications/show.njk | 2 +- server/views/applications/start.njk | 2 +- server/views/pages/error.njk | 2 +- server/views/temporary-accommodation/arrivals/new.njk | 2 +- server/views/temporary-accommodation/assessments/archive.njk | 2 +- server/views/temporary-accommodation/assessments/confirm.njk | 2 +- server/views/temporary-accommodation/assessments/full.njk | 2 +- server/views/temporary-accommodation/assessments/index.njk | 2 +- server/views/temporary-accommodation/assessments/summary.njk | 2 +- server/views/temporary-accommodation/bedspace-search/index.njk | 2 +- server/views/temporary-accommodation/bedspaces/edit.njk | 2 +- server/views/temporary-accommodation/bedspaces/new.njk | 2 +- server/views/temporary-accommodation/bedspaces/show.njk | 2 +- server/views/temporary-accommodation/booking-search/results.njk | 2 +- server/views/temporary-accommodation/bookings/confirm.njk | 2 +- server/views/temporary-accommodation/bookings/history.njk | 2 +- server/views/temporary-accommodation/bookings/new.njk | 2 +- .../views/temporary-accommodation/bookings/selectAssessment.njk | 2 +- server/views/temporary-accommodation/bookings/show.njk | 2 +- server/views/temporary-accommodation/cancellations/edit.njk | 2 +- server/views/temporary-accommodation/cancellations/new.njk | 2 +- server/views/temporary-accommodation/confirmations/new.njk | 2 +- server/views/temporary-accommodation/dashboard/index.njk | 2 +- server/views/temporary-accommodation/departures/edit.njk | 2 +- server/views/temporary-accommodation/departures/new.njk | 2 +- server/views/temporary-accommodation/extensions/new.njk | 2 +- server/views/temporary-accommodation/lost-beds/cancel.njk | 2 +- server/views/temporary-accommodation/lost-beds/edit.njk | 2 +- server/views/temporary-accommodation/lost-beds/new.njk | 2 +- server/views/temporary-accommodation/lost-beds/show.njk | 2 +- server/views/temporary-accommodation/premises/edit.njk | 2 +- server/views/temporary-accommodation/premises/index.njk | 2 +- server/views/temporary-accommodation/premises/new.njk | 2 +- server/views/temporary-accommodation/premises/show.njk | 2 +- server/views/temporary-accommodation/reports/new.njk | 2 +- server/views/temporary-accommodation/static/cookies.njk | 2 +- server/views/temporary-accommodation/static/notAuthorised.njk | 2 +- server/views/temporary-accommodation/static/useNDelius.njk | 2 +- server/views/temporary-accommodation/turnarounds/new.njk | 2 +- 47 files changed, 47 insertions(+), 47 deletions(-) diff --git a/integration_tests/tests/temporary-accommodation/cookies.cy.ts b/integration_tests/tests/temporary-accommodation/cookies.cy.ts index bce91ac38..e9391b7b8 100644 --- a/integration_tests/tests/temporary-accommodation/cookies.cy.ts +++ b/integration_tests/tests/temporary-accommodation/cookies.cy.ts @@ -9,7 +9,7 @@ context('Cookies', () => { it('should navigate to the cookie policy page', () => { cy.signIn() cy.contains('Cookies').click() - cy.title().should('eq', 'Cookies') + cy.title().should('eq', 'Cookies - Temporary Accommodation') cy.contains('Cookies are small files saved on your phone, tablet or computer when you visit a website.') }) }) diff --git a/server/views/applications/confirm.njk b/server/views/applications/confirm.njk index fabc73b6b..38f9587f7 100644 --- a/server/views/applications/confirm.njk +++ b/server/views/applications/confirm.njk @@ -4,7 +4,7 @@ {% extends "../partials/layout.njk" %} -{% set pageTitle = applicationName + " - Referral complete" %} +{% set pageTitle = "Referral complete - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block content %} diff --git a/server/views/applications/index.njk b/server/views/applications/index.njk index e4b228130..9ca3446ee 100644 --- a/server/views/applications/index.njk +++ b/server/views/applications/index.njk @@ -6,7 +6,7 @@ {% from "./_table.njk" import applicationsTable %} {% extends "../partials/layout.njk" %} -{% set pageTitle = applicationName + " - Temporary Accommodation (TA) referrals" %} +{% set pageTitle = "Temporary Accommodation (TA) referrals - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block content %} diff --git a/server/views/applications/new.njk b/server/views/applications/new.njk index a53ceb979..c29fc1836 100644 --- a/server/views/applications/new.njk +++ b/server/views/applications/new.njk @@ -5,7 +5,7 @@ {% extends "../partials/layout.njk" %} -{% set pageTitle = applicationName + " - Enter the person's CRN" %} +{% set pageTitle = "Enter the person's CRN - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block content %} diff --git a/server/views/applications/pages/check-your-answers/check-your-answers/review.njk b/server/views/applications/pages/check-your-answers/check-your-answers/review.njk index 5d3caaff6..0c6e36585 100644 --- a/server/views/applications/pages/check-your-answers/check-your-answers/review.njk +++ b/server/views/applications/pages/check-your-answers/check-your-answers/review.njk @@ -5,7 +5,7 @@ {% extends "../../../../partials/layout.njk" %} -{% set pageTitle = applicationName + " - " + page.title %} +{% set pageTitle = page.title + " - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent%} diff --git a/server/views/applications/pages/layout.njk b/server/views/applications/pages/layout.njk index 827ce5467..c492fe781 100644 --- a/server/views/applications/pages/layout.njk +++ b/server/views/applications/pages/layout.njk @@ -16,7 +16,7 @@ {% extends "../../partials/layout.njk" %} -{% set pageTitle = applicationName + " - " + page.title %} +{% set pageTitle = page.title + " - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} diff --git a/server/views/applications/people/confirm.njk b/server/views/applications/people/confirm.njk index ebfda2265..bdc15a442 100644 --- a/server/views/applications/people/confirm.njk +++ b/server/views/applications/people/confirm.njk @@ -5,7 +5,7 @@ {% extends "../../partials/layout.njk" %} -{% set pageTitle = applicationName + " - Confirm " + personName(person) + "'s details" %} +{% set pageTitle = "Confirm " + personName(person) + "'s details - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} diff --git a/server/views/applications/people/selectOffence.njk b/server/views/applications/people/selectOffence.njk index 0cf5c52fb..ef907084d 100644 --- a/server/views/applications/people/selectOffence.njk +++ b/server/views/applications/people/selectOffence.njk @@ -3,7 +3,7 @@ {% extends "../../partials/layout.njk" %} -{% set pageTitle = applicationName + " - Select the index offence for " + personName(person) %} +{% set pageTitle = "Select the index offence for " + personName(person) + " - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block content %} diff --git a/server/views/applications/show.njk b/server/views/applications/show.njk index 43fd2ef04..89ee2b9be 100644 --- a/server/views/applications/show.njk +++ b/server/views/applications/show.njk @@ -8,7 +8,7 @@ {% extends "../partials/layout.njk" %} -{% set pageTitle = applicationName + " - Make a referral for Temporary Accommodation" %} +{% set pageTitle = "Make a referral for Temporary Accommodation - " + applicationName %} {% block beforeContent %} {{ govukBackLink({ diff --git a/server/views/applications/start.njk b/server/views/applications/start.njk index 8a55fbc99..01d912e0a 100644 --- a/server/views/applications/start.njk +++ b/server/views/applications/start.njk @@ -4,7 +4,7 @@ {% extends "../partials/layout.njk" %} -{% set pageTitle = applicationName + " - Make a referral for Temporary Accommodation" %} +{% set pageTitle = "Make a referral for Temporary Accommodation - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} diff --git a/server/views/pages/error.njk b/server/views/pages/error.njk index 947c137a4..c6802d8dc 100755 --- a/server/views/pages/error.njk +++ b/server/views/pages/error.njk @@ -1,6 +1,6 @@ {% extends "../partials/layout.njk" %} -{% set pageTitle = applicationName + " - Error" %} +{% set pageTitle = "Error - " + applicationName %} {% block content %} diff --git a/server/views/temporary-accommodation/arrivals/new.njk b/server/views/temporary-accommodation/arrivals/new.njk index 0ea08abb1..4ad2b2761 100644 --- a/server/views/temporary-accommodation/arrivals/new.njk +++ b/server/views/temporary-accommodation/arrivals/new.njk @@ -10,7 +10,7 @@ {% extends "../../partials/layout.njk" %} -{% set pageTitle = applicationName + " - Mark booking as active" %} +{% set pageTitle = "Mark booking as active - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} diff --git a/server/views/temporary-accommodation/assessments/archive.njk b/server/views/temporary-accommodation/assessments/archive.njk index 9880a544e..06b0a232f 100644 --- a/server/views/temporary-accommodation/assessments/archive.njk +++ b/server/views/temporary-accommodation/assessments/archive.njk @@ -7,7 +7,7 @@ {% extends "../../partials/layout.njk" %} -{% set pageTitle = applicationName + " - Archived referrals" %} +{% set pageTitle = "Archived referrals - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} diff --git a/server/views/temporary-accommodation/assessments/confirm.njk b/server/views/temporary-accommodation/assessments/confirm.njk index 84ea688ac..ddeb39dc9 100644 --- a/server/views/temporary-accommodation/assessments/confirm.njk +++ b/server/views/temporary-accommodation/assessments/confirm.njk @@ -3,7 +3,7 @@ {% extends "../../partials/layout.njk" %} -{% set pageTitle = applicationName + " - confirmation" %} +{% set pageTitle = "Confirmation - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} diff --git a/server/views/temporary-accommodation/assessments/full.njk b/server/views/temporary-accommodation/assessments/full.njk index 17cc6677a..a68f73c3d 100644 --- a/server/views/temporary-accommodation/assessments/full.njk +++ b/server/views/temporary-accommodation/assessments/full.njk @@ -6,7 +6,7 @@ {% extends "../../partials/layout.njk" %} {% set name = personName(assessment.application.person, 'Limited access offender') %} -{% set pageTitle = applicationName + " - " + name + " referral" %} +{% set pageTitle = name + " referral - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} diff --git a/server/views/temporary-accommodation/assessments/index.njk b/server/views/temporary-accommodation/assessments/index.njk index 0eafd2397..8b607ff8b 100644 --- a/server/views/temporary-accommodation/assessments/index.njk +++ b/server/views/temporary-accommodation/assessments/index.njk @@ -7,7 +7,7 @@ {% extends "../../partials/layout.njk" %} -{% set pageTitle = applicationName + " - Referrals" %} +{% set pageTitle = "Referrals - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% set unallocatedTableHtml %} diff --git a/server/views/temporary-accommodation/assessments/summary.njk b/server/views/temporary-accommodation/assessments/summary.njk index 6088e1810..617684361 100644 --- a/server/views/temporary-accommodation/assessments/summary.njk +++ b/server/views/temporary-accommodation/assessments/summary.njk @@ -13,7 +13,7 @@ {% extends "../../partials/layout.njk" %} {% set name = personName(assessment.application.person, 'Limited access offender') %} -{% set pageTitle = applicationName + " - " + name + " referral summary" %} +{% set pageTitle = name + " referral summary - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% set breadCrumbTitle = name + " - Summary" %} diff --git a/server/views/temporary-accommodation/bedspace-search/index.njk b/server/views/temporary-accommodation/bedspace-search/index.njk index f5074d390..816840f43 100644 --- a/server/views/temporary-accommodation/bedspace-search/index.njk +++ b/server/views/temporary-accommodation/bedspace-search/index.njk @@ -11,7 +11,7 @@ {% extends "../../partials/layout.njk" %} -{% set pageTitle = applicationName + " - Search for available bedspaces" %} +{% set pageTitle = "Search for available bedspaces - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} diff --git a/server/views/temporary-accommodation/bedspaces/edit.njk b/server/views/temporary-accommodation/bedspaces/edit.njk index e581e1012..016f22881 100644 --- a/server/views/temporary-accommodation/bedspaces/edit.njk +++ b/server/views/temporary-accommodation/bedspaces/edit.njk @@ -4,7 +4,7 @@ {% extends "../../partials/layout.njk" %} -{% set pageTitle = applicationName + " - Edit a bedspace" %} +{% set pageTitle = "Edit a bedspace - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} diff --git a/server/views/temporary-accommodation/bedspaces/new.njk b/server/views/temporary-accommodation/bedspaces/new.njk index b4754a2cd..d83a87985 100644 --- a/server/views/temporary-accommodation/bedspaces/new.njk +++ b/server/views/temporary-accommodation/bedspaces/new.njk @@ -5,7 +5,7 @@ {% extends "../../partials/layout.njk" %} -{% set pageTitle = applicationName + " - Add a bedspace" %} +{% set pageTitle = "Add a bedspace - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} diff --git a/server/views/temporary-accommodation/bedspaces/show.njk b/server/views/temporary-accommodation/bedspaces/show.njk index de6b4a24b..6e1d98862 100644 --- a/server/views/temporary-accommodation/bedspaces/show.njk +++ b/server/views/temporary-accommodation/bedspaces/show.njk @@ -10,7 +10,7 @@ {% extends "../../partials/layout.njk" %} -{% set pageTitle = applicationName + " - View a bedspace" %} +{% set pageTitle = "View a bedspace - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% set bodyClasses = "temporary-accommodation-bedspaces-show" %} diff --git a/server/views/temporary-accommodation/booking-search/results.njk b/server/views/temporary-accommodation/booking-search/results.njk index e6d57ffea..69f793545 100644 --- a/server/views/temporary-accommodation/booking-search/results.njk +++ b/server/views/temporary-accommodation/booking-search/results.njk @@ -3,7 +3,7 @@ {% extends "../../partials/layout.njk" %} {% from "../../partials/breadCrumb.njk" import breadCrumb %} -{% set pageTitle = applicationName + " - View bookings" %} +{% set pageTitle = "View bookings - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} diff --git a/server/views/temporary-accommodation/bookings/confirm.njk b/server/views/temporary-accommodation/bookings/confirm.njk index 2363da951..4a5661f0a 100644 --- a/server/views/temporary-accommodation/bookings/confirm.njk +++ b/server/views/temporary-accommodation/bookings/confirm.njk @@ -8,7 +8,7 @@ {% extends "../../partials/layout.njk" %} -{% set pageTitle = applicationName + " - Book bedspace" %} +{% set pageTitle = "Book bedspace - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} diff --git a/server/views/temporary-accommodation/bookings/history.njk b/server/views/temporary-accommodation/bookings/history.njk index 853a4001a..122c3f76e 100644 --- a/server/views/temporary-accommodation/bookings/history.njk +++ b/server/views/temporary-accommodation/bookings/history.njk @@ -7,7 +7,7 @@ {% extends "../../partials/layout.njk" %} -{% set pageTitle = applicationName + " - Booking history" %} +{% set pageTitle = "Booking history - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} diff --git a/server/views/temporary-accommodation/bookings/new.njk b/server/views/temporary-accommodation/bookings/new.njk index 25c7d12bd..5a36f371d 100644 --- a/server/views/temporary-accommodation/bookings/new.njk +++ b/server/views/temporary-accommodation/bookings/new.njk @@ -5,7 +5,7 @@ {% extends "../../partials/layout.njk" %} -{% set pageTitle = applicationName + " - Book bedspace" %} +{% set pageTitle = "Book bedspace - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} diff --git a/server/views/temporary-accommodation/bookings/selectAssessment.njk b/server/views/temporary-accommodation/bookings/selectAssessment.njk index 72fc57a74..1aa6f4859 100644 --- a/server/views/temporary-accommodation/bookings/selectAssessment.njk +++ b/server/views/temporary-accommodation/bookings/selectAssessment.njk @@ -8,7 +8,7 @@ {% extends "../../partials/layout.njk" %} -{% set pageTitle = applicationName + " - Book bedspace" %} +{% set pageTitle = "Book bedspace - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} diff --git a/server/views/temporary-accommodation/bookings/show.njk b/server/views/temporary-accommodation/bookings/show.njk index 1af2ceb6b..ab6af8ad6 100644 --- a/server/views/temporary-accommodation/bookings/show.njk +++ b/server/views/temporary-accommodation/bookings/show.njk @@ -9,7 +9,7 @@ {% extends "../../partials/layout.njk" %} -{% set pageTitle = applicationName + " - View a booking" %} +{% set pageTitle = "View a booking - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% set bodyClasses = "temporary-accommodation-bookings-show" %} diff --git a/server/views/temporary-accommodation/cancellations/edit.njk b/server/views/temporary-accommodation/cancellations/edit.njk index b1eaaed74..cfca8afb6 100644 --- a/server/views/temporary-accommodation/cancellations/edit.njk +++ b/server/views/temporary-accommodation/cancellations/edit.njk @@ -6,7 +6,7 @@ {% extends "../../partials/layout.njk" %} -{% set pageTitle = applicationName + " - Update cancelled booking" %} +{% set pageTitle = "Update cancelled booking - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} diff --git a/server/views/temporary-accommodation/cancellations/new.njk b/server/views/temporary-accommodation/cancellations/new.njk index 480355f08..2ccfa347b 100644 --- a/server/views/temporary-accommodation/cancellations/new.njk +++ b/server/views/temporary-accommodation/cancellations/new.njk @@ -6,7 +6,7 @@ {% extends "../../partials/layout.njk" %} -{% set pageTitle = applicationName + " - Cancel booking" %} +{% set pageTitle = "Cancel booking - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} diff --git a/server/views/temporary-accommodation/confirmations/new.njk b/server/views/temporary-accommodation/confirmations/new.njk index 1b41fdf75..15b349d7f 100644 --- a/server/views/temporary-accommodation/confirmations/new.njk +++ b/server/views/temporary-accommodation/confirmations/new.njk @@ -7,7 +7,7 @@ {% extends "../../partials/layout.njk" %} -{% set pageTitle = applicationName + " - Mark booking as confirmed" %} +{% set pageTitle = "Mark booking as confirmed - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} diff --git a/server/views/temporary-accommodation/dashboard/index.njk b/server/views/temporary-accommodation/dashboard/index.njk index d93d041aa..75c476014 100644 --- a/server/views/temporary-accommodation/dashboard/index.njk +++ b/server/views/temporary-accommodation/dashboard/index.njk @@ -1,6 +1,6 @@ {% extends "../../partials/layout.njk" %} -{% set pageTitle = applicationName + " - Manage estate" %} +{% set pageTitle = "Manage estate - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% set bodyClasses = "temporary-accommodation-dashboard-index" %} diff --git a/server/views/temporary-accommodation/departures/edit.njk b/server/views/temporary-accommodation/departures/edit.njk index 73b64d4e4..117c3d945 100644 --- a/server/views/temporary-accommodation/departures/edit.njk +++ b/server/views/temporary-accommodation/departures/edit.njk @@ -6,7 +6,7 @@ {% extends "../../partials/layout.njk" %} -{% set pageTitle = applicationName + " - Update departure details" %} +{% set pageTitle = "Update departure details - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} diff --git a/server/views/temporary-accommodation/departures/new.njk b/server/views/temporary-accommodation/departures/new.njk index ff60806fe..9fe455b74 100644 --- a/server/views/temporary-accommodation/departures/new.njk +++ b/server/views/temporary-accommodation/departures/new.njk @@ -6,7 +6,7 @@ {% extends "../../partials/layout.njk" %} -{% set pageTitle = applicationName + " - Mark booking as departed" %} +{% set pageTitle = "Mark booking as departed - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} diff --git a/server/views/temporary-accommodation/extensions/new.njk b/server/views/temporary-accommodation/extensions/new.njk index 65cb2cec7..4e3255c2a 100644 --- a/server/views/temporary-accommodation/extensions/new.njk +++ b/server/views/temporary-accommodation/extensions/new.njk @@ -9,7 +9,7 @@ {% extends "../../partials/layout.njk" %} -{% set pageTitle = applicationName + " - Extend or shorten booking" %} +{% set pageTitle = "Extend or shorten booking - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} diff --git a/server/views/temporary-accommodation/lost-beds/cancel.njk b/server/views/temporary-accommodation/lost-beds/cancel.njk index b3624cf89..d56bdde9e 100644 --- a/server/views/temporary-accommodation/lost-beds/cancel.njk +++ b/server/views/temporary-accommodation/lost-beds/cancel.njk @@ -8,7 +8,7 @@ {% extends "../../partials/layout.njk" %} -{% set pageTitle = applicationName + " - Cancel void booking" %} +{% set pageTitle = "Cancel void booking - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} diff --git a/server/views/temporary-accommodation/lost-beds/edit.njk b/server/views/temporary-accommodation/lost-beds/edit.njk index 45ae4395d..36c018785 100644 --- a/server/views/temporary-accommodation/lost-beds/edit.njk +++ b/server/views/temporary-accommodation/lost-beds/edit.njk @@ -3,7 +3,7 @@ {% from "../../partials/breadCrumb.njk" import breadCrumb %} {% from "../components/location-header/macro.njk" import locationHeader %} -{% set pageTitle = applicationName + " - Void bedspace" %} +{% set pageTitle = "Void bedspace - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} diff --git a/server/views/temporary-accommodation/lost-beds/new.njk b/server/views/temporary-accommodation/lost-beds/new.njk index 104c8a331..4bdbf3c91 100644 --- a/server/views/temporary-accommodation/lost-beds/new.njk +++ b/server/views/temporary-accommodation/lost-beds/new.njk @@ -3,7 +3,7 @@ {% from "../../partials/breadCrumb.njk" import breadCrumb %} {% from "../components/location-header/macro.njk" import locationHeader %} -{% set pageTitle = applicationName + " - Void bedspace" %} +{% set pageTitle = "Void bedspace - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} diff --git a/server/views/temporary-accommodation/lost-beds/show.njk b/server/views/temporary-accommodation/lost-beds/show.njk index 31a47aebe..eaaec5999 100644 --- a/server/views/temporary-accommodation/lost-beds/show.njk +++ b/server/views/temporary-accommodation/lost-beds/show.njk @@ -7,7 +7,7 @@ {% extends "../../partials/layout.njk" %} -{% set pageTitle = applicationName + " - Void booking" %} +{% set pageTitle = "Void booking - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} diff --git a/server/views/temporary-accommodation/premises/edit.njk b/server/views/temporary-accommodation/premises/edit.njk index cee12fbf3..a64d50130 100644 --- a/server/views/temporary-accommodation/premises/edit.njk +++ b/server/views/temporary-accommodation/premises/edit.njk @@ -5,7 +5,7 @@ {% extends "../../partials/layout.njk" %} -{% set pageTitle = applicationName + " - Add a property" %} +{% set pageTitle = "Add a property - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} diff --git a/server/views/temporary-accommodation/premises/index.njk b/server/views/temporary-accommodation/premises/index.njk index 419ba5711..f655d2ddc 100644 --- a/server/views/temporary-accommodation/premises/index.njk +++ b/server/views/temporary-accommodation/premises/index.njk @@ -6,7 +6,7 @@ {% extends "../../partials/layout.njk" %} {% from "../../partials/breadCrumb.njk" import breadCrumb %} -{% set pageTitle = applicationName + " - List of properties" %} +{% set pageTitle = "List of properties - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} diff --git a/server/views/temporary-accommodation/premises/new.njk b/server/views/temporary-accommodation/premises/new.njk index 4a9f953ae..f299144a4 100644 --- a/server/views/temporary-accommodation/premises/new.njk +++ b/server/views/temporary-accommodation/premises/new.njk @@ -3,7 +3,7 @@ {% from "../../partials/showErrorSummary.njk" import showErrorSummary %} {% from "../../partials/breadCrumb.njk" import breadCrumb %} -{% set pageTitle = applicationName + " - Add a property" %} +{% set pageTitle = "Add a property - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} diff --git a/server/views/temporary-accommodation/premises/show.njk b/server/views/temporary-accommodation/premises/show.njk index 644e275b6..e8c540c01 100644 --- a/server/views/temporary-accommodation/premises/show.njk +++ b/server/views/temporary-accommodation/premises/show.njk @@ -7,7 +7,7 @@ {% extends "../../partials/layout.njk" %} -{% set pageTitle = applicationName + " - View a property" %} +{% set pageTitle = "View a property - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% set bodyClasses = "temporary-accommodation-premises-show" %} diff --git a/server/views/temporary-accommodation/reports/new.njk b/server/views/temporary-accommodation/reports/new.njk index 1bee841f1..47e614eeb 100644 --- a/server/views/temporary-accommodation/reports/new.njk +++ b/server/views/temporary-accommodation/reports/new.njk @@ -4,7 +4,7 @@ {% from "../../partials/breadCrumb.njk" import breadCrumb %} {% from "../components/ta-select/macro.njk" import taSelect %} -{% set pageTitle = applicationName + " - Reports" %} +{% set pageTitle = "Reports - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} diff --git a/server/views/temporary-accommodation/static/cookies.njk b/server/views/temporary-accommodation/static/cookies.njk index 5fa19ae75..cd737ac53 100644 --- a/server/views/temporary-accommodation/static/cookies.njk +++ b/server/views/temporary-accommodation/static/cookies.njk @@ -1,6 +1,6 @@ {% extends "partials/layout.njk" %} -{% set pageTitle = "Cookies" %} +{% set pageTitle = "Cookies - " + applicationName %} {% block content %}
diff --git a/server/views/temporary-accommodation/static/notAuthorised.njk b/server/views/temporary-accommodation/static/notAuthorised.njk index 23d1b5f23..b99b9d5f8 100644 --- a/server/views/temporary-accommodation/static/notAuthorised.njk +++ b/server/views/temporary-accommodation/static/notAuthorised.njk @@ -1,6 +1,6 @@ {% extends "partials/layout.njk" %} -{% set pageTitle = applicationName + " - Not Authorised" %} +{% set pageTitle = "Not Authorised - " + applicationName %} {% block content %}
diff --git a/server/views/temporary-accommodation/static/useNDelius.njk b/server/views/temporary-accommodation/static/useNDelius.njk index e0b9f38e8..b33d80d0a 100644 --- a/server/views/temporary-accommodation/static/useNDelius.njk +++ b/server/views/temporary-accommodation/static/useNDelius.njk @@ -1,6 +1,6 @@ {% extends "partials/layout.njk" %} -{% set pageTitle = applicationName + " - Referrals should be submitted through nDelius" %} +{% set pageTitle = "Referrals should be submitted through nDelius - " + applicationName %} {% block content %}
diff --git a/server/views/temporary-accommodation/turnarounds/new.njk b/server/views/temporary-accommodation/turnarounds/new.njk index 7188c13c0..ae9b6dba9 100644 --- a/server/views/temporary-accommodation/turnarounds/new.njk +++ b/server/views/temporary-accommodation/turnarounds/new.njk @@ -8,7 +8,7 @@ {% extends "../../partials/layout.njk" %} -{% set pageTitle = applicationName + " - Change turnaround time" %} +{% set pageTitle = "Change turnaround time - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} From 0d9f859fb757403984f8fc2420a37ca5e7f13026 Mon Sep 17 00:00:00 2001 From: Daniel Liburd Date: Wed, 13 Sep 2023 12:32:10 +0100 Subject: [PATCH 2/3] Remove person name from form page titles Presently we reuse the page title for the html document title on form pages. As some of the page titles contain a person's name, this is a security issue. This commit decouples the form page title from what's applied as the html document title by introducing a new required `htmlDocumentTitle` property. We also change the titles which contain a person's name and instead put "the person" it's place. --- server/@types/ui/index.d.ts | 1 + .../apply/accommodation-need/consent/consentGiven.ts | 2 ++ .../accommodation-need/contact-details/backupContact.ts | 2 ++ .../accommodation-need/contact-details/practitionerPdu.ts | 2 ++ .../contact-details/probationPractitioner.ts | 2 ++ .../eligibility/accommodationRequiredFromDate.ts | 2 ++ .../accommodation-need/eligibility/eligibilityReason.ts | 2 ++ .../apply/accommodation-need/eligibility/releaseDate.ts | 2 ++ .../sentence-information/offendingSummary.ts | 2 ++ .../sentence-information/releaseType.ts | 2 ++ .../sentence-information/sentenceExpiry.ts | 8 ++++---- .../sentence-information/sentenceLength.ts | 8 ++++---- .../sentence-information/sentenceType.ts | 2 ++ .../approvalsForSpecificRisks.ts | 2 ++ .../behaviour-in-cas/previousStays.ts | 6 +++--- .../behaviour-in-cas/previousStaysDetails.ts | 2 ++ .../licence-conditions/additionalLicenceConditions.ts | 2 ++ .../placement-considerations/accommodationSharing.ts | 2 ++ .../placement-considerations/antiSocialBehaviour.ts | 2 ++ .../placement-considerations/cooperation.ts | 2 ++ .../placement-considerations/riskManagementPlan.ts | 2 ++ .../placement-considerations/roshLevel.ts | 2 ++ .../placement-considerations/substanceMisuse.ts | 2 ++ .../prison-information/acctAlerts.ts | 2 ++ .../prison-information/adjudications.ts | 2 ++ server/form-pages/apply/check-your-answers/review.ts | 2 ++ server/form-pages/apply/contactDetails.test.ts | 2 ++ server/form-pages/apply/contactDetails.ts | 2 ++ .../accommodation-referral-details/crsSubmitted.ts | 2 ++ .../accommodation-referral-details/dtrDetails.ts | 2 ++ .../accommodation-referral-details/dtrSubmitted.ts | 2 ++ .../otherAccommodationOptions.ts | 2 ++ .../disability-cultural-and-specific-needs/needs.ts | 2 ++ .../propertyAttributesOrAdaptations.ts | 2 ++ .../religiousOrCulturalNeeds.ts | 2 ++ .../food-allergies/foodAllergies.ts | 2 ++ .../requirements-for-placement/move-on-plan/moveOnPlan.ts | 2 ++ .../placement-location/alternativePdu.ts | 2 ++ .../safeguarding-and-support/caringResponsibilities.ts | 2 ++ .../safeguarding-and-support/localConnections.ts | 2 ++ .../safeguardingAndVulnerability.ts | 2 ++ .../safeguarding-and-support/supportInTheComunity.ts | 2 ++ server/form-pages/tasklistPage.ts | 2 ++ server/form-pages/utils/decorators/task.decorator.test.ts | 2 ++ server/views/applications/pages/layout.njk | 2 +- 45 files changed, 93 insertions(+), 12 deletions(-) diff --git a/server/@types/ui/index.d.ts b/server/@types/ui/index.d.ts index 933e61e9a..fd954acb2 100644 --- a/server/@types/ui/index.d.ts +++ b/server/@types/ui/index.d.ts @@ -23,6 +23,7 @@ import { CallConfig } from '../../data/restClient' interface TasklistPage { body: Record + htmlDocumentTitle: string } interface PersonService {} diff --git a/server/form-pages/apply/accommodation-need/consent/consentGiven.ts b/server/form-pages/apply/accommodation-need/consent/consentGiven.ts index 261733b08..0ca5005ba 100644 --- a/server/form-pages/apply/accommodation-need/consent/consentGiven.ts +++ b/server/form-pages/apply/accommodation-need/consent/consentGiven.ts @@ -13,6 +13,8 @@ type ConsentGivenBody = { export default class ConsentGiven implements TasklistPage { title = 'Has consent for Temporary Accommodation been given?' + htmlDocumentTitle = this.title + constructor( readonly body: Partial, readonly application: Application, diff --git a/server/form-pages/apply/accommodation-need/contact-details/backupContact.ts b/server/form-pages/apply/accommodation-need/contact-details/backupContact.ts index 0a78fcd1c..080cde57e 100644 --- a/server/form-pages/apply/accommodation-need/contact-details/backupContact.ts +++ b/server/form-pages/apply/accommodation-need/contact-details/backupContact.ts @@ -6,6 +6,8 @@ import ContactDetails from '../../contactDetails' export default class BackupContact extends ContactDetails implements TasklistPage { title = 'Backup contact / senior probation officer details' + htmlDocumentTitle = this.title + nextPageId = 'practitioner-pdu' previousPageId = 'probation-practitioner' diff --git a/server/form-pages/apply/accommodation-need/contact-details/practitionerPdu.ts b/server/form-pages/apply/accommodation-need/contact-details/practitionerPdu.ts index 2bee9bfbf..6306b39a8 100644 --- a/server/form-pages/apply/accommodation-need/contact-details/practitionerPdu.ts +++ b/server/form-pages/apply/accommodation-need/contact-details/practitionerPdu.ts @@ -9,6 +9,8 @@ type PractitionerPduBody = { pdu: string } export default class PractitionerPdu implements TasklistPage { title: string + htmlDocumentTitle = "What is the person's PDU?" + constructor( readonly body: Partial, readonly application: Application, diff --git a/server/form-pages/apply/accommodation-need/contact-details/probationPractitioner.ts b/server/form-pages/apply/accommodation-need/contact-details/probationPractitioner.ts index a47172a72..8afaf63f5 100644 --- a/server/form-pages/apply/accommodation-need/contact-details/probationPractitioner.ts +++ b/server/form-pages/apply/accommodation-need/contact-details/probationPractitioner.ts @@ -6,6 +6,8 @@ import ContactDetails from '../../contactDetails' export default class ProbationPractitioner extends ContactDetails implements TasklistPage { title = 'Probation practitioner details' + htmlDocumentTitle = this.title + previousPageId = 'dashboard' nextPageId = 'backup-contact' diff --git a/server/form-pages/apply/accommodation-need/eligibility/accommodationRequiredFromDate.ts b/server/form-pages/apply/accommodation-need/eligibility/accommodationRequiredFromDate.ts index 111f3a43b..3c8d98f60 100644 --- a/server/form-pages/apply/accommodation-need/eligibility/accommodationRequiredFromDate.ts +++ b/server/form-pages/apply/accommodation-need/eligibility/accommodationRequiredFromDate.ts @@ -14,6 +14,8 @@ type AccommodationRequiredFromDateBody = ObjectWithDateParts<'accommodationRequi export default class AccommodationRequiredFromDate implements TasklistPage { title = 'What date is accommodation required from?' + htmlDocumentTitle = this.title + constructor( private _body: Partial, readonly application: Application, diff --git a/server/form-pages/apply/accommodation-need/eligibility/eligibilityReason.ts b/server/form-pages/apply/accommodation-need/eligibility/eligibilityReason.ts index 5a0395bfe..168163c20 100644 --- a/server/form-pages/apply/accommodation-need/eligibility/eligibilityReason.ts +++ b/server/form-pages/apply/accommodation-need/eligibility/eligibilityReason.ts @@ -19,6 +19,8 @@ type EligibilityReasonBody = { reason: EligibilityReasonsT } export default class EligibilityReason implements TasklistPage { title: string + htmlDocumentTitle = 'How is the person eligible for Temporary Accommodation (TA)?' + constructor( readonly body: Partial, readonly application: Application, diff --git a/server/form-pages/apply/accommodation-need/eligibility/releaseDate.ts b/server/form-pages/apply/accommodation-need/eligibility/releaseDate.ts index 1bec2e52f..8394b15e3 100644 --- a/server/form-pages/apply/accommodation-need/eligibility/releaseDate.ts +++ b/server/form-pages/apply/accommodation-need/eligibility/releaseDate.ts @@ -15,6 +15,8 @@ type ReleaseDateBody = ObjectWithDateParts<'releaseDate'> export default class ReleaseDate implements TasklistPage { title: string + htmlDocumentTitle = "What is the person's release date?" + constructor( private _body: Partial, readonly application: Application, diff --git a/server/form-pages/apply/accommodation-need/sentence-information/offendingSummary.ts b/server/form-pages/apply/accommodation-need/sentence-information/offendingSummary.ts index 6a043d369..79343f861 100644 --- a/server/form-pages/apply/accommodation-need/sentence-information/offendingSummary.ts +++ b/server/form-pages/apply/accommodation-need/sentence-information/offendingSummary.ts @@ -13,6 +13,8 @@ export type OffendingSummaryBody = { export default class OffendingSummary implements TasklistPage { title: string + htmlDocumentTitle = "Provide a brief summary of the person's offending history" + constructor( readonly body: Partial, readonly application: Application, diff --git a/server/form-pages/apply/accommodation-need/sentence-information/releaseType.ts b/server/form-pages/apply/accommodation-need/sentence-information/releaseType.ts index 864dd33fb..75324dece 100644 --- a/server/form-pages/apply/accommodation-need/sentence-information/releaseType.ts +++ b/server/form-pages/apply/accommodation-need/sentence-information/releaseType.ts @@ -26,6 +26,8 @@ type ReleaseTypeBody = { export default class ReleaseType implements TasklistPage { title = 'What is the release type?' + htmlDocumentTitle = this.title + constructor( private _body: Partial, readonly application: Application, diff --git a/server/form-pages/apply/accommodation-need/sentence-information/sentenceExpiry.ts b/server/form-pages/apply/accommodation-need/sentence-information/sentenceExpiry.ts index 2b938ecab..f75e2550f 100644 --- a/server/form-pages/apply/accommodation-need/sentence-information/sentenceExpiry.ts +++ b/server/form-pages/apply/accommodation-need/sentence-information/sentenceExpiry.ts @@ -9,14 +9,14 @@ type SentenceExpiryBody = ObjectWithDateParts<'sentenceExpiryDate'> @Page({ name: 'sentence-expiry', bodyProperties: dateBodyProperties('sentenceExpiryDate') }) export default class SentenceExpiry implements TasklistPage { - title: string + title = 'Sentence expiry date' + + htmlDocumentTitle = this.title constructor( private _body: Partial, readonly application: Application, - ) { - this.title = 'Sentence expiry date' - } + ) {} public set body(value: Partial) { this._body = { diff --git a/server/form-pages/apply/accommodation-need/sentence-information/sentenceLength.ts b/server/form-pages/apply/accommodation-need/sentence-information/sentenceLength.ts index 997754619..d255f2658 100644 --- a/server/form-pages/apply/accommodation-need/sentence-information/sentenceLength.ts +++ b/server/form-pages/apply/accommodation-need/sentence-information/sentenceLength.ts @@ -24,14 +24,14 @@ const sentenceLengthComponentResponse = (value: string, singularLabel: string, p @Page({ name: 'sentence-length', bodyProperties: ['years', 'months', 'weeks', 'days'] }) export default class SentenceLength implements TasklistPage { - title: string + title = 'What is the sentence length?' + + htmlDocumentTitle = this.title constructor( readonly body: Partial, readonly application: Application, - ) { - this.title = 'What is the sentence length?' - } + ) {} response() { const years = sentenceLengthComponentResponse(this.body.years, 'year', 'years') diff --git a/server/form-pages/apply/accommodation-need/sentence-information/sentenceType.ts b/server/form-pages/apply/accommodation-need/sentence-information/sentenceType.ts index 96262b407..d66213cfd 100644 --- a/server/form-pages/apply/accommodation-need/sentence-information/sentenceType.ts +++ b/server/form-pages/apply/accommodation-need/sentence-information/sentenceType.ts @@ -18,6 +18,8 @@ export type SentenceTypesT = keyof typeof sentenceTypes export default class SentenceType implements TasklistPage { title = 'Which of the following best describes the sentence type?' + htmlDocumentTitle = this.title + constructor( readonly body: { sentenceType?: SentenceTypesT }, readonly application: Application, diff --git a/server/form-pages/apply/assess-placement-risks-and-needs/approvals-for-specific-risks/approvalsForSpecificRisks.ts b/server/form-pages/apply/assess-placement-risks-and-needs/approvals-for-specific-risks/approvalsForSpecificRisks.ts index ba5b4bee6..be1f91db6 100644 --- a/server/form-pages/apply/assess-placement-risks-and-needs/approvals-for-specific-risks/approvalsForSpecificRisks.ts +++ b/server/form-pages/apply/assess-placement-risks-and-needs/approvals-for-specific-risks/approvalsForSpecificRisks.ts @@ -27,6 +27,8 @@ type ApprovalsForSpecificRisksBody = { export default class ApprovalsForSpecificRisks implements TasklistPage { title = 'Approvals for specific risks' + htmlDocumentTitle = this.title + questions = { approvals: 'Have your received approval for this referral?', } diff --git a/server/form-pages/apply/assess-placement-risks-and-needs/behaviour-in-cas/previousStays.ts b/server/form-pages/apply/assess-placement-risks-and-needs/behaviour-in-cas/previousStays.ts index 4ec5b1c4d..57cd9a218 100644 --- a/server/form-pages/apply/assess-placement-risks-and-needs/behaviour-in-cas/previousStays.ts +++ b/server/form-pages/apply/assess-placement-risks-and-needs/behaviour-in-cas/previousStays.ts @@ -10,7 +10,9 @@ type PreviousStaysBody = { previousStays: YesNoOrIDK } @Page({ name: 'previous-stays', bodyProperties: ['previousStays'] }) export default class PreviousStays implements TasklistPage { - title: string + title = 'Behaviour in previous accommodation' + + htmlDocumentTitle = this.title questions: { previousStays: string @@ -22,8 +24,6 @@ export default class PreviousStays implements TasklistPage { ) { const name = personName(application.person) - this.title = 'Behaviour in previous accommodation' - this.questions = { previousStays: `Has ${name} previously stayed in Community Accommodation Services (CAS)?`, } diff --git a/server/form-pages/apply/assess-placement-risks-and-needs/behaviour-in-cas/previousStaysDetails.ts b/server/form-pages/apply/assess-placement-risks-and-needs/behaviour-in-cas/previousStaysDetails.ts index 99081af62..3d6b578eb 100644 --- a/server/form-pages/apply/assess-placement-risks-and-needs/behaviour-in-cas/previousStaysDetails.ts +++ b/server/form-pages/apply/assess-placement-risks-and-needs/behaviour-in-cas/previousStaysDetails.ts @@ -31,6 +31,8 @@ type PreviousStaysDetailsBody = { export default class PreviousStaysDetails implements TasklistPage { title: string + htmlDocumentTitle = 'What type of accommodation did the person stay at?' + constructor( readonly body: Partial, readonly application: Application, diff --git a/server/form-pages/apply/assess-placement-risks-and-needs/licence-conditions/additionalLicenceConditions.ts b/server/form-pages/apply/assess-placement-risks-and-needs/licence-conditions/additionalLicenceConditions.ts index dbd0ccb5b..77561efda 100644 --- a/server/form-pages/apply/assess-placement-risks-and-needs/licence-conditions/additionalLicenceConditions.ts +++ b/server/form-pages/apply/assess-placement-risks-and-needs/licence-conditions/additionalLicenceConditions.ts @@ -76,6 +76,8 @@ type AdditionalLicenceConditionsBody = { export default class AdditionalLicenceConditions implements TasklistPage { title = 'Additional licence conditions' + htmlDocumentTitle = this.title + constructor( readonly body: Partial, readonly application: Application, diff --git a/server/form-pages/apply/assess-placement-risks-and-needs/placement-considerations/accommodationSharing.ts b/server/form-pages/apply/assess-placement-risks-and-needs/placement-considerations/accommodationSharing.ts index c7594849f..b897cb2c7 100644 --- a/server/form-pages/apply/assess-placement-risks-and-needs/placement-considerations/accommodationSharing.ts +++ b/server/form-pages/apply/assess-placement-risks-and-needs/placement-considerations/accommodationSharing.ts @@ -19,6 +19,8 @@ type AccommodationSharingBody = { export default class AccommodationSharing implements TasklistPage { title = 'Accommodation sharing' + htmlDocumentTitle = this.title + questions: { accommodationSharing: string } diff --git a/server/form-pages/apply/assess-placement-risks-and-needs/placement-considerations/antiSocialBehaviour.ts b/server/form-pages/apply/assess-placement-risks-and-needs/placement-considerations/antiSocialBehaviour.ts index c2fbc0222..9c556c97f 100644 --- a/server/form-pages/apply/assess-placement-risks-and-needs/placement-considerations/antiSocialBehaviour.ts +++ b/server/form-pages/apply/assess-placement-risks-and-needs/placement-considerations/antiSocialBehaviour.ts @@ -12,6 +12,8 @@ type AntiSocialBehaviourBody = YesOrNoWithDetail<'concerns'> export default class AntiSocialBehaviour implements TasklistPage { title = 'Anti-social behaviour' + htmlDocumentTitle = this.title + questions = { concerns: 'Are there any concerns or risks relating to anti-social behaviour?', } diff --git a/server/form-pages/apply/assess-placement-risks-and-needs/placement-considerations/cooperation.ts b/server/form-pages/apply/assess-placement-risks-and-needs/placement-considerations/cooperation.ts index d8b273af9..487b7e637 100644 --- a/server/form-pages/apply/assess-placement-risks-and-needs/placement-considerations/cooperation.ts +++ b/server/form-pages/apply/assess-placement-risks-and-needs/placement-considerations/cooperation.ts @@ -17,6 +17,8 @@ type CooperationBody = { export default class Cooperation implements TasklistPage { title = 'Cooperation' + htmlDocumentTitle = this.title + questions: { support: string } diff --git a/server/form-pages/apply/assess-placement-risks-and-needs/placement-considerations/riskManagementPlan.ts b/server/form-pages/apply/assess-placement-risks-and-needs/placement-considerations/riskManagementPlan.ts index 2c61e1a81..f27125562 100644 --- a/server/form-pages/apply/assess-placement-risks-and-needs/placement-considerations/riskManagementPlan.ts +++ b/server/form-pages/apply/assess-placement-risks-and-needs/placement-considerations/riskManagementPlan.ts @@ -25,6 +25,8 @@ export default class RiskManagementPlan implements OasysPage { title = 'Risk management plan' + htmlDocumentTitle = this.title + risks: PersonRisksUI oasysSuccess: boolean diff --git a/server/form-pages/apply/assess-placement-risks-and-needs/placement-considerations/roshLevel.ts b/server/form-pages/apply/assess-placement-risks-and-needs/placement-considerations/roshLevel.ts index fe5427bed..37629cc46 100644 --- a/server/form-pages/apply/assess-placement-risks-and-needs/placement-considerations/roshLevel.ts +++ b/server/form-pages/apply/assess-placement-risks-and-needs/placement-considerations/roshLevel.ts @@ -19,6 +19,8 @@ type RoshLevelBody = { export default class RoshLevel implements TasklistPage { title = 'RoSH level' + htmlDocumentTitle = this.title + risks: PersonRisksUI constructor( diff --git a/server/form-pages/apply/assess-placement-risks-and-needs/placement-considerations/substanceMisuse.ts b/server/form-pages/apply/assess-placement-risks-and-needs/placement-considerations/substanceMisuse.ts index 8fb802f20..980e24584 100644 --- a/server/form-pages/apply/assess-placement-risks-and-needs/placement-considerations/substanceMisuse.ts +++ b/server/form-pages/apply/assess-placement-risks-and-needs/placement-considerations/substanceMisuse.ts @@ -13,6 +13,8 @@ type SubstanceMisuseBody = YesOrNoWithDetail<'substanceMisuse'> export default class SubstanceMisuse implements TasklistPage { title = 'Substance misuse' + htmlDocumentTitle = this.title + questions: { substanceMisuse: string } diff --git a/server/form-pages/apply/assess-placement-risks-and-needs/prison-information/acctAlerts.ts b/server/form-pages/apply/assess-placement-risks-and-needs/prison-information/acctAlerts.ts index 64237a10d..b0f3afb3c 100644 --- a/server/form-pages/apply/assess-placement-risks-and-needs/prison-information/acctAlerts.ts +++ b/server/form-pages/apply/assess-placement-risks-and-needs/prison-information/acctAlerts.ts @@ -26,6 +26,8 @@ export const acctAlertResponse = (acctAlert: PersonAcctAlert) => { export default class AcctAlerts implements TasklistPage { title = 'ACCT' + htmlDocumentTitle = this.title + importDate: string constructor( diff --git a/server/form-pages/apply/assess-placement-risks-and-needs/prison-information/adjudications.ts b/server/form-pages/apply/assess-placement-risks-and-needs/prison-information/adjudications.ts index 9d6f17299..ea032c161 100644 --- a/server/form-pages/apply/assess-placement-risks-and-needs/prison-information/adjudications.ts +++ b/server/form-pages/apply/assess-placement-risks-and-needs/prison-information/adjudications.ts @@ -28,6 +28,8 @@ export const adjudicationResponse = (adjudication: Adjudication) => { export default class Adjudications implements TasklistPage { title = 'Adjudications' + htmlDocumentTitle = this.title + importDate: string constructor( diff --git a/server/form-pages/apply/check-your-answers/review.ts b/server/form-pages/apply/check-your-answers/review.ts index 72a95056c..959599b15 100644 --- a/server/form-pages/apply/check-your-answers/review.ts +++ b/server/form-pages/apply/check-your-answers/review.ts @@ -10,6 +10,8 @@ export default class Review implements TasklistPage { title = 'Check your answers' + htmlDocumentTitle = this.title + constructor( public body: { reviewed?: string }, readonly application: TemporaryAccommodationApplication, diff --git a/server/form-pages/apply/contactDetails.test.ts b/server/form-pages/apply/contactDetails.test.ts index cf005aa37..7c66d440d 100644 --- a/server/form-pages/apply/contactDetails.test.ts +++ b/server/form-pages/apply/contactDetails.test.ts @@ -7,6 +7,8 @@ import ContactDetails from './contactDetails' class ConcreteContactDetails extends ContactDetails implements TasklistPage { title = 'A title' + htmlDocumentTitle = this.title + previousPageId = 'previous-page-id' nextPageId = 'next-page-id' diff --git a/server/form-pages/apply/contactDetails.ts b/server/form-pages/apply/contactDetails.ts index 52eac34bc..234ac1297 100644 --- a/server/form-pages/apply/contactDetails.ts +++ b/server/form-pages/apply/contactDetails.ts @@ -5,6 +5,8 @@ type ContactDetailsBody = { name: string; phone: string; email: string } export default abstract class ContactDetails { abstract title: string + abstract htmlDocumentTitle: string + abstract previousPageId: string abstract nextPageId: string diff --git a/server/form-pages/apply/required-referrals/accommodation-referral-details/crsSubmitted.ts b/server/form-pages/apply/required-referrals/accommodation-referral-details/crsSubmitted.ts index 6b72a2443..b0a784bd5 100644 --- a/server/form-pages/apply/required-referrals/accommodation-referral-details/crsSubmitted.ts +++ b/server/form-pages/apply/required-referrals/accommodation-referral-details/crsSubmitted.ts @@ -14,6 +14,8 @@ type CrsSubmittedBody = { export default class CrsSubmitted implements TasklistPage { title = 'Has a referral to Commissioned Rehabilitative Services (CRS) been submitted?' + htmlDocumentTitle = this.title + constructor( readonly body: Partial, readonly application: Application, diff --git a/server/form-pages/apply/required-referrals/accommodation-referral-details/dtrDetails.ts b/server/form-pages/apply/required-referrals/accommodation-referral-details/dtrDetails.ts index 3062e879e..7a8e88e53 100644 --- a/server/form-pages/apply/required-referrals/accommodation-referral-details/dtrDetails.ts +++ b/server/form-pages/apply/required-referrals/accommodation-referral-details/dtrDetails.ts @@ -14,6 +14,8 @@ type DtrDetailsBody = { export default class DtrDetails implements TasklistPage { title = 'Provide further details' + htmlDocumentTitle = this.title + questions = { reference: 'DTR / NOP reference number', date: 'Date DTR / NOP was submitted', diff --git a/server/form-pages/apply/required-referrals/accommodation-referral-details/dtrSubmitted.ts b/server/form-pages/apply/required-referrals/accommodation-referral-details/dtrSubmitted.ts index 2f1c0025c..2a93ea2cf 100644 --- a/server/form-pages/apply/required-referrals/accommodation-referral-details/dtrSubmitted.ts +++ b/server/form-pages/apply/required-referrals/accommodation-referral-details/dtrSubmitted.ts @@ -13,6 +13,8 @@ type DtrSubmittedBody = { export default class DtrSubmitted implements TasklistPage { title = 'Has the Duty to Refer (DTR) / National Offender Pathway (NOP) been submitted?' + htmlDocumentTitle = this.title + constructor( readonly body: Partial, readonly application: Application, diff --git a/server/form-pages/apply/required-referrals/accommodation-referral-details/otherAccommodationOptions.ts b/server/form-pages/apply/required-referrals/accommodation-referral-details/otherAccommodationOptions.ts index f4c89a0fc..c6c9f8845 100644 --- a/server/form-pages/apply/required-referrals/accommodation-referral-details/otherAccommodationOptions.ts +++ b/server/form-pages/apply/required-referrals/accommodation-referral-details/otherAccommodationOptions.ts @@ -11,6 +11,8 @@ type OtherAccommodationOptionsBody = YesOrNoWithDetail<'otherOptions'> export default class OtherAccommodationOptions implements TasklistPage { title = 'Have other accommodation options been considered?' + htmlDocumentTitle = this.title + constructor( readonly body: Partial, readonly application: Application, diff --git a/server/form-pages/apply/requirements-for-placement/disability-cultural-and-specific-needs/needs.ts b/server/form-pages/apply/requirements-for-placement/disability-cultural-and-specific-needs/needs.ts index 2b6d86de6..3f6ce44c6 100644 --- a/server/form-pages/apply/requirements-for-placement/disability-cultural-and-specific-needs/needs.ts +++ b/server/form-pages/apply/requirements-for-placement/disability-cultural-and-specific-needs/needs.ts @@ -64,6 +64,8 @@ type NeedsBody = { export default class Needs implements TasklistPage { title: string + htmlDocumentTitle = 'Does the person have any of the following needs?' + constructor( readonly body: Partial, readonly application: Application, diff --git a/server/form-pages/apply/requirements-for-placement/disability-cultural-and-specific-needs/propertyAttributesOrAdaptations.ts b/server/form-pages/apply/requirements-for-placement/disability-cultural-and-specific-needs/propertyAttributesOrAdaptations.ts index a16dd13c3..475be0859 100644 --- a/server/form-pages/apply/requirements-for-placement/disability-cultural-and-specific-needs/propertyAttributesOrAdaptations.ts +++ b/server/form-pages/apply/requirements-for-placement/disability-cultural-and-specific-needs/propertyAttributesOrAdaptations.ts @@ -15,6 +15,8 @@ type PropertyAttributesOrAdaptationsBody = YesOrNoWithDetail<'propertyAttributes export default class PropertyAttributesOrAdaptations implements TasklistPage { title: string + htmlDocumentTitle = 'Will the person require a property with specific attributes or adaptations?' + constructor( readonly body: Partial, readonly application: Application, diff --git a/server/form-pages/apply/requirements-for-placement/disability-cultural-and-specific-needs/religiousOrCulturalNeeds.ts b/server/form-pages/apply/requirements-for-placement/disability-cultural-and-specific-needs/religiousOrCulturalNeeds.ts index 3c567db84..cfb9fd44a 100644 --- a/server/form-pages/apply/requirements-for-placement/disability-cultural-and-specific-needs/religiousOrCulturalNeeds.ts +++ b/server/form-pages/apply/requirements-for-placement/disability-cultural-and-specific-needs/religiousOrCulturalNeeds.ts @@ -15,6 +15,8 @@ type ReligiousOrCulturalNeedsBody = YesOrNoWithDetail<'religiousOrCulturalNeeds' export default class ReligiousOrCulturalNeeds implements TasklistPage { title: string + htmlDocumentTitle = 'Does the person have any religious or cultural needs?' + constructor( readonly body: Partial, readonly application: Application, diff --git a/server/form-pages/apply/requirements-for-placement/food-allergies/foodAllergies.ts b/server/form-pages/apply/requirements-for-placement/food-allergies/foodAllergies.ts index 355161f0e..51d5f719c 100644 --- a/server/form-pages/apply/requirements-for-placement/food-allergies/foodAllergies.ts +++ b/server/form-pages/apply/requirements-for-placement/food-allergies/foodAllergies.ts @@ -12,6 +12,8 @@ type FoodAllergiesBody = YesNoOrIDKWithDetail<'foodAllergies'> export default class FoodAllergies implements TasklistPage { title = 'Food allergies' + htmlDocumentTitle = this.title + questions: { foodAllergies: string } diff --git a/server/form-pages/apply/requirements-for-placement/move-on-plan/moveOnPlan.ts b/server/form-pages/apply/requirements-for-placement/move-on-plan/moveOnPlan.ts index 0e9779b52..ff753680d 100644 --- a/server/form-pages/apply/requirements-for-placement/move-on-plan/moveOnPlan.ts +++ b/server/form-pages/apply/requirements-for-placement/move-on-plan/moveOnPlan.ts @@ -9,6 +9,8 @@ type MoveOnPlanBody = { plan: string } export default class MoveOnPlan implements TasklistPage { title: string + htmlDocumentTitle = 'How will you prepare the person for move on after placement?' + constructor( readonly body: Partial, readonly application: Application, diff --git a/server/form-pages/apply/requirements-for-placement/placement-location/alternativePdu.ts b/server/form-pages/apply/requirements-for-placement/placement-location/alternativePdu.ts index 14e29e194..0acd89308 100644 --- a/server/form-pages/apply/requirements-for-placement/placement-location/alternativePdu.ts +++ b/server/form-pages/apply/requirements-for-placement/placement-location/alternativePdu.ts @@ -11,6 +11,8 @@ type AlternativePduBody = YesOrNoWithDetail<'alternativePdu'> export default class AlternativePdu implements TasklistPage { title = 'Is placement required in an alternative PDU?' + htmlDocumentTitle = this.title + constructor( readonly body: Partial, readonly application: Application, diff --git a/server/form-pages/apply/requirements-for-placement/safeguarding-and-support/caringResponsibilities.ts b/server/form-pages/apply/requirements-for-placement/safeguarding-and-support/caringResponsibilities.ts index 59751cf26..31217e184 100644 --- a/server/form-pages/apply/requirements-for-placement/safeguarding-and-support/caringResponsibilities.ts +++ b/server/form-pages/apply/requirements-for-placement/safeguarding-and-support/caringResponsibilities.ts @@ -12,6 +12,8 @@ type CaringResponsibilitiesBody = YesOrNoWithDetail<'caringResponsibilities'> export default class CaringResponsibilities implements TasklistPage { title = 'Caring responsibilities' + htmlDocumentTitle = this.title + questions: { caringResponsibilities: string } diff --git a/server/form-pages/apply/requirements-for-placement/safeguarding-and-support/localConnections.ts b/server/form-pages/apply/requirements-for-placement/safeguarding-and-support/localConnections.ts index 51fe5f8e4..a8e2d8e23 100644 --- a/server/form-pages/apply/requirements-for-placement/safeguarding-and-support/localConnections.ts +++ b/server/form-pages/apply/requirements-for-placement/safeguarding-and-support/localConnections.ts @@ -12,6 +12,8 @@ type LocalConnectionsBody = { export default class LocalConnections implements TasklistPage { title = 'Local connections' + htmlDocumentTitle = this.title + constructor( readonly body: Partial, readonly application: Application, diff --git a/server/form-pages/apply/requirements-for-placement/safeguarding-and-support/safeguardingAndVulnerability.ts b/server/form-pages/apply/requirements-for-placement/safeguarding-and-support/safeguardingAndVulnerability.ts index e8bc39d70..8bb9b47fd 100644 --- a/server/form-pages/apply/requirements-for-placement/safeguarding-and-support/safeguardingAndVulnerability.ts +++ b/server/form-pages/apply/requirements-for-placement/safeguarding-and-support/safeguardingAndVulnerability.ts @@ -11,6 +11,8 @@ type SafeguardingAndVulnerabilityBody = YesOrNoWithDetail<'concerns'> export default class SafeguardingAndVulnerability implements TasklistPage { title = 'Safeguarding and vulnerability' + htmlDocumentTitle = this.title + questions = { concerns: 'Do you have any concerns about safeguarding and/or vulnerability?', } diff --git a/server/form-pages/apply/requirements-for-placement/safeguarding-and-support/supportInTheComunity.ts b/server/form-pages/apply/requirements-for-placement/safeguarding-and-support/supportInTheComunity.ts index 075f40f83..607d53343 100644 --- a/server/form-pages/apply/requirements-for-placement/safeguarding-and-support/supportInTheComunity.ts +++ b/server/form-pages/apply/requirements-for-placement/safeguarding-and-support/supportInTheComunity.ts @@ -12,6 +12,8 @@ type SupportInTheCommunityBody = { export default class SupportInTheCommunity implements TasklistPage { title = 'Support in the community' + htmlDocumentTitle = this.title + constructor( readonly body: Partial, readonly application: Application, diff --git a/server/form-pages/tasklistPage.ts b/server/form-pages/tasklistPage.ts index 0717b3b0e..af6a1c4c9 100644 --- a/server/form-pages/tasklistPage.ts +++ b/server/form-pages/tasklistPage.ts @@ -21,6 +21,8 @@ export interface TasklistPageInterface { export default abstract class TasklistPage { abstract title: string + abstract htmlDocumentTitle: string + abstract body: Record abstract previous(): string diff --git a/server/form-pages/utils/decorators/task.decorator.test.ts b/server/form-pages/utils/decorators/task.decorator.test.ts index ec0688e16..ac929c96e 100644 --- a/server/form-pages/utils/decorators/task.decorator.test.ts +++ b/server/form-pages/utils/decorators/task.decorator.test.ts @@ -5,6 +5,8 @@ import Task from './task.decorator' class PageBase implements TasklistPage { title: string + htmlDocumentTitle: string + body: Record previous() { diff --git a/server/views/applications/pages/layout.njk b/server/views/applications/pages/layout.njk index c492fe781..6ef894645 100644 --- a/server/views/applications/pages/layout.njk +++ b/server/views/applications/pages/layout.njk @@ -16,7 +16,7 @@ {% extends "../../partials/layout.njk" %} -{% set pageTitle = page.title + " - " + applicationName %} +{% set pageTitle = page.htmlDocumentTitle + " - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} From d0b25a0b4f53ec319119ecffbc0762cd4d00f46a Mon Sep 17 00:00:00 2001 From: Daniel Liburd Date: Wed, 13 Sep 2023 12:45:02 +0100 Subject: [PATCH 3/3] Remove person name from page titles This commit removes the person name from the pages that are setting the page title directly. --- server/views/applications/people/confirm.njk | 2 +- server/views/applications/people/selectOffence.njk | 2 +- server/views/temporary-accommodation/assessments/full.njk | 4 ++-- server/views/temporary-accommodation/assessments/summary.njk | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/views/applications/people/confirm.njk b/server/views/applications/people/confirm.njk index bdc15a442..0f17e96da 100644 --- a/server/views/applications/people/confirm.njk +++ b/server/views/applications/people/confirm.njk @@ -5,7 +5,7 @@ {% extends "../../partials/layout.njk" %} -{% set pageTitle = "Confirm " + personName(person) + "'s details - " + applicationName %} +{% set pageTitle = "Confirm the person's details - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} diff --git a/server/views/applications/people/selectOffence.njk b/server/views/applications/people/selectOffence.njk index ef907084d..a2ff41761 100644 --- a/server/views/applications/people/selectOffence.njk +++ b/server/views/applications/people/selectOffence.njk @@ -3,7 +3,7 @@ {% extends "../../partials/layout.njk" %} -{% set pageTitle = "Select the index offence for " + personName(person) + " - " + applicationName %} +{% set pageTitle = "Select the index offence for the person - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block content %} diff --git a/server/views/temporary-accommodation/assessments/full.njk b/server/views/temporary-accommodation/assessments/full.njk index a68f73c3d..6973fc8fc 100644 --- a/server/views/temporary-accommodation/assessments/full.njk +++ b/server/views/temporary-accommodation/assessments/full.njk @@ -5,8 +5,7 @@ {% extends "../../partials/layout.njk" %} -{% set name = personName(assessment.application.person, 'Limited access offender') %} -{% set pageTitle = name + " referral - " + applicationName %} +{% set pageTitle = "The person's referral - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} {% block beforeContent %} @@ -17,6 +16,7 @@ {{ placeContextHeader(placeContext) }} {% endblock %} +{% set name = personName(assessment.application.person, 'Limited access offender') %} {% block content %} {% include "../../_messages.njk" %} diff --git a/server/views/temporary-accommodation/assessments/summary.njk b/server/views/temporary-accommodation/assessments/summary.njk index 617684361..1dd71b4bf 100644 --- a/server/views/temporary-accommodation/assessments/summary.njk +++ b/server/views/temporary-accommodation/assessments/summary.njk @@ -12,10 +12,10 @@ {% extends "../../partials/layout.njk" %} -{% set name = personName(assessment.application.person, 'Limited access offender') %} -{% set pageTitle = name + " referral summary - " + applicationName %} +{% set pageTitle = "The person's referral summary - " + applicationName %} {% set mainClasses = "app-container govuk-body" %} +{% set name = personName(assessment.application.person, 'Limited access offender') %} {% set breadCrumbTitle = name + " - Summary" %} {% block beforeContent %}