diff --git a/CHANGELOG.md b/CHANGELOG.md index 09409130a..fbac23e03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ :wrench: **Maintenance** +- Update wording about reverse examples - Tweak page title example to improve readability - Update page titles to use en-dash rather than hyphen - Replace BSL icons download file diff --git a/app.js b/app.js index bec8aaac8..48c316cfb 100755 --- a/app.js +++ b/app.js @@ -133,9 +133,14 @@ env.addFilter('highlight', filters.highlight) env.addFilter('markdown', filters.markdown) // Render standalone design examples -app.get('/design-example/:group/:item/:type', (req, res) => { +app.get('/design-example/:group/:item/:type', (req, res, next) => { const { group, item, type } = req.params + // Continue to 404 page + if (!fileHelper.hasNunjucksPath({ group, item, type })) { + return next() + } + // Get the given example as HTML. const exampleHtml = fileHelper.getHTMLCode({ group, @@ -161,7 +166,7 @@ app.get('/design-example/:group/:item/:type', (req, res) => { }) app.get('/search', (req, res) => { - const query = req.query['search-field'] || '' + const query = req.query['searchField'] || '' const resultsPerPage = 10 let currentPage = parseInt(req.query.page, 10) const results = pageIndex.search(query) @@ -262,6 +267,12 @@ app.get( } ) +// Redirects for design system examples + +app.get('/design-example/components/checkboxes/hint', (req, res) => { + res.redirect('/design-example/components/checkboxes/hint-text') +}) + // Redirects for design system patterns app.get( diff --git a/app/assets/review-date-pattern-embedded-content.jpg b/app/assets/review-date-pattern-embedded-content.jpg new file mode 100644 index 000000000..a7fadcd3e Binary files /dev/null and b/app/assets/review-date-pattern-embedded-content.jpg differ diff --git a/app/assets/review-date-pattern-embedded-content.png b/app/assets/review-date-pattern-embedded-content.png deleted file mode 100644 index 897e78728..000000000 Binary files a/app/assets/review-date-pattern-embedded-content.png and /dev/null differ diff --git a/app/javascripts/main.mjs b/app/javascripts/main.mjs index 0ad0fc96a..f1aff7d44 100644 --- a/app/javascripts/main.mjs +++ b/app/javascripts/main.mjs @@ -22,7 +22,7 @@ initAll({ initAccessibleAutocomplete({ containerId: 'autocomplete-container', formId: 'search', - inputId: 'search-field', + inputId: 'searchField', onConfirm, source, templates: { diff --git a/app/views/accessibility-statement.njk b/app/views/accessibility-statement.njk index b6b5dea54..b6231438d 100644 --- a/app/views/accessibility-statement.njk +++ b/app/views/accessibility-statement.njk @@ -1,9 +1,9 @@ +{% extends "layouts/app-layout-two-thirds.njk" %} + {% set pageTitle = "Accessibility statement" %} {% set pageDescription = "We aim to make the NHS digital service manual as accessible and easy to use as possible." %} {% set dateUpdated = "June 2019" %} -{% extends "layouts/app-layout-two-thirds.njk" %} - {% block bodyContent %}
We've designed our pages to meet the Web Content Accessibility Guidelines to level AA - and in some cases AAA - and we've tested them with users with access needs.
diff --git a/app/views/accessibility/content.njk b/app/views/accessibility/content.njk index 8877b39ce..433c620ae 100644 --- a/app/views/accessibility/content.njk +++ b/app/views/accessibility/content.njk @@ -1,3 +1,5 @@ +{% extends "layouts/app-layout.njk" %} + {% set pageTitle = "Content" %} {% set pageSection = "Accessibility" %} {% set subSection = "Accessibility" %} @@ -6,8 +8,6 @@ {% set dateUpdated = "February 2025" %} {% set backlog_issue_id = "347" %} -{% extends "layouts/app-layout.njk" %} - {% block beforeContent %} {% include "accessibility/_breadcrumb.njk" %} {% endblock %} diff --git a/app/views/accessibility/design.njk b/app/views/accessibility/design.njk index 402e66b3e..6defdfefc 100644 --- a/app/views/accessibility/design.njk +++ b/app/views/accessibility/design.njk @@ -1,3 +1,5 @@ +{% extends "layouts/app-layout.njk" %} + {% set pageTitle = "Design" %} {% set pageSection = "Accessibility" %} {% set subSection = "Accessibility" %} @@ -6,8 +8,6 @@ {% set dateUpdated = "February 2025" %} {% set backlog_issue_id = "349" %} -{% extends "layouts/app-layout.njk" %} - {% block beforeContent %} {% include "accessibility/_breadcrumb.njk" %} {% endblock %} diff --git a/app/views/accessibility/development.njk b/app/views/accessibility/development.njk index 40b2d3ac7..a233aec63 100644 --- a/app/views/accessibility/development.njk +++ b/app/views/accessibility/development.njk @@ -1,3 +1,5 @@ +{% extends "layouts/app-layout.njk" %} + {% set pageTitle = "Development" %} {% set pageSection = "Accessibility" %} {% set subSection = "Accessibility" %} @@ -6,8 +8,6 @@ {% set dateUpdated = "January 2025" %} {% set backlog_issue_id = "348" %} -{% extends "layouts/app-layout.njk" %} - {% block beforeContent %} {% include "accessibility/_breadcrumb.njk" %} {% endblock %} diff --git a/app/views/accessibility/download-accessibility-posters.njk b/app/views/accessibility/download-accessibility-posters.njk index 1ec4fd263..65f6ce561 100644 --- a/app/views/accessibility/download-accessibility-posters.njk +++ b/app/views/accessibility/download-accessibility-posters.njk @@ -1,3 +1,5 @@ +{% extends "layouts/app-layout.njk" %} + {% set pageTitle = "Download accessibility posters" %} {% set pageSection = "Accessibility" %} {% set subSection = "Accessibility" %} @@ -6,8 +8,6 @@ {% set dateUpdated = "December 2021" %} {% set backlog_issue_id = "405" %} -{% extends "layouts/app-layout.njk" %} - {% block beforeContent %} {% include "accessibility/_breadcrumb.njk" %} {% endblock %} @@ -62,8 +62,6 @@(On a green background, with an icon showing a clipboard with a tick on it.)
Download poster for testing (PDF, 44KB)
- - {% endblock %} {% block asideContent %} diff --git a/app/views/accessibility/getting-started.njk b/app/views/accessibility/getting-started.njk index 54c1b3978..4df034103 100644 --- a/app/views/accessibility/getting-started.njk +++ b/app/views/accessibility/getting-started.njk @@ -1,3 +1,5 @@ +{% extends "layouts/app-layout.njk" %} + {% set pageTitle = "Getting started with accessibility" %} {% set pageSection = "Accessibility" %} {% set subSection = "Accessibility" %} @@ -6,8 +8,6 @@ {% set dateUpdated = "January 2025" %} {% set backlog_issue_id = "352" %} -{% extends "layouts/app-layout.njk" %} - {% block beforeContent %} {% include "accessibility/_breadcrumb.njk" %} {% endblock %} @@ -50,7 +50,6 @@Join the GOV.UK accessibility community or talk to NHS colleagues on our public Slack workspace to get advice and support, stay up to date and share examples.
- {% endblock %} {% block asideContent %} diff --git a/app/views/accessibility/how-to-make-digital-services-accessible.njk b/app/views/accessibility/how-to-make-digital-services-accessible.njk index ed5e6d979..3d6fdd5aa 100644 --- a/app/views/accessibility/how-to-make-digital-services-accessible.njk +++ b/app/views/accessibility/how-to-make-digital-services-accessible.njk @@ -1,3 +1,5 @@ +{% extends "layouts/app-layout.njk" %} + {% set pageTitle = "How to make digital services accessible" %} {% set pageSection = "Accessibility" %} {% set subSection = "Accessibility" %} @@ -6,8 +8,6 @@ {% set dateUpdated = "January 2024" %} {% set backlog_issue_id = "351" %} -{% extends "layouts/app-layout.njk" %} - {% block beforeContent %} {% include "accessibility/_breadcrumb.njk" %} {% endblock %} @@ -51,7 +51,6 @@Follow our guidance on testing and our guidance on monitoring and recording accessibility testing (for product and delivery managers).
Find out about getting an accessibility audit (GOV.UK service manual). - {% endblock %} {% block asideContent %} diff --git a/app/views/accessibility/index.njk b/app/views/accessibility/index.njk index eb21466c1..ff56e6efa 100644 --- a/app/views/accessibility/index.njk +++ b/app/views/accessibility/index.njk @@ -1,14 +1,13 @@ +{% extends "layouts/app-layout.njk" %} + {% set pageTitle = "Accessibility" %} {% set pageDescription = "How to make digital services in the NHS work for everyone." %} {% set pageSection = "Accessibility" %} {% set landingPage = true %} {% set hideContact = "true" %} -{% extends "layouts/app-layout.njk" %} - {% block bodyContent %} -
Your service must be accessible to everyone who needs it. If it is not, you may be breaking the law.
Everyone who works on NHS digital services has a role to play in making them accessible and inclusive.
@@ -17,8 +16,6 @@Find out more about the new criteria that WCAG 2.2 introduced.
The Government Digital Service, Department of Health and Social Care and NHS England are now monitoring accessibility to WCAG 2.2.
- - diff --git a/app/views/accessibility/new-criteria-in-wcag-2-2.njk b/app/views/accessibility/new-criteria-in-wcag-2-2.njk index e9be9f28e..e51cdc0bf 100644 --- a/app/views/accessibility/new-criteria-in-wcag-2-2.njk +++ b/app/views/accessibility/new-criteria-in-wcag-2-2.njk @@ -1,3 +1,5 @@ +{% extends "layouts/app-layout.njk" %} + {% set pageTitle = "New criteria in WCAG 2.2" %} {% set pageSection = "Accessibility" %} {% set subSection = "Accessibility" %} @@ -6,8 +8,6 @@ {% set dateUpdated = "October 2024" %} {% set backlog_issue_id = "512" %} -{% extends "layouts/app-layout.njk" %} - {% block beforeContent %} {% include "accessibility/_breadcrumb.njk" %} {% endblock %} @@ -66,7 +66,6 @@If your service provides help options such as contact details or live chat, they should be presented consistently across pages, to make sure users can find and interact with them easily. Learn more about consistent help (W3C website).
-Find out:
diff --git a/app/views/community-and-contribution/propose-component-pattern.njk b/app/views/community-and-contribution/propose-component-pattern.njk index 9441ae913..9cb93176d 100644 --- a/app/views/community-and-contribution/propose-component-pattern.njk +++ b/app/views/community-and-contribution/propose-component-pattern.njk @@ -1,10 +1,10 @@ +{% extends "layouts/app-layout.njk" %} + {% set pageTitle = "Propose a component or pattern" %} {% set pageSection = "Community and contribution" %} {% set pageDescription = "Anyone can propose a new thing for the NHS digital service manual." %} {% set dateUpdated = "March 2019" %} -{% extends "layouts/app-layout.njk" %} - {% block beforeContent %} {% include "community-and-contribution/_breadcrumb.njk" %} {% endblock %} diff --git a/app/views/content/a-to-z-of-nhs-health-writing.njk b/app/views/content/a-to-z-of-nhs-health-writing.njk index 032f9fd75..d81690f5f 100644 --- a/app/views/content/a-to-z-of-nhs-health-writing.njk +++ b/app/views/content/a-to-z-of-nhs-health-writing.njk @@ -1,11 +1,11 @@ +{% extends "layouts/app-layout.njk" %} + {% set pageTitle = "A to Z of NHS health writing" %} {% set pageSection = "Content guide" %} {% set pageDescription = "Words and phrases we use to make our content about health and the NHS easy to understand." %} {% set dateUpdated = "July 2025" %} {% set backlog_issue_id = "318" %} -{% extends "layouts/app-layout.njk" %} - {% block head %} {{ super() }} @@ -219,7 +219,7 @@See poo.
You can use round brackets ( ) but do not overuse them.
-Do not use brackets to refer to something that could either be singular or plural, like "lie down with your leg(s) on cushions". If in doubt, use the plural: legs.
+Do not use brackets to refer to something that could either be singular or plural, like "lie down with your leg(s) on cushions". If in doubt, use the plural: legs.
Starts with a capital letter.
We use "kidney" instead of "renal".
We may mention "renal" as well as "kidney" if our search analytics, user testing or survey feedback suggest that people will hear their doctor use "renal" or will search for it.
-Use MB for anything over 1MB: 4MB not 4096KB.
-Use KB for anything under 1MB: 569KB not 0.55MB.
-Find out how we use KB and MB for document size in our guidance on links.
+Use MB for anything over 1MB: 4MB not 4096KB.
+Use KB for anything under 1MB: 569KB not 0.55MB.
+Find out how we use KB and MB for document size in our guidance on links.
Back to top @@ -697,7 +697,7 @@We write "breast milk" as two words.
Do not use decimals unless pence are included. Write "£75" and "£75.50", but not "£75.00".
-Write out "pence" in full: "Calls will cost 4 pence a minute from a landline".
+Write out "pence" in full: "Calls will cost 4 pence a minute from a landline".
See also our guidance on numbers, measurements, dates and time.
Lower case without hyphens. It can be "emergency contraception".
@@ -1128,7 +1128,7 @@See the guidance on underlining on the Formatting page.
Use "United Kingdom" or "UK" rather than "Britain" or "Great Britain".
-United Kingdom includes England, Scotland, Wales and Northern Ireland. Great Britain refers only to England, Scotland and Wales.
+United Kingdom includes England, Scotland, Wales and Northern Ireland. Great Britain refers only to England, Scotland and Wales.
Our work is focused on the NHS in England. Take care not to refer to the UK when you mean England.
Use "unplanned' rather than "unwanted" when talking about pregnancy.
@@ -1234,6 +1234,4 @@ - - {% endblock %} diff --git a/app/views/content/british-sign-language-bsl-quality-assurance-standard.njk b/app/views/content/british-sign-language-bsl-quality-assurance-standard.njk index 7d66022db..731f65cfb 100644 --- a/app/views/content/british-sign-language-bsl-quality-assurance-standard.njk +++ b/app/views/content/british-sign-language-bsl-quality-assurance-standard.njk @@ -1,11 +1,11 @@ +{% extends "layouts/app-layout.njk" %} + {% set pageTitle = "British Sign Language (BSL) quality assurance standard" %} {% set pageSection = "Content guide" %} {% set pageDescription = "This standard outlines the clinical assurance process for creating BSL translations of pre-recorded videos for the NHS. It also includes guidance on video production." %} {% set dateUpdated = "January 2024" %} {% set backlog_issue_id = "459" %} -{% extends "layouts/app-layout.njk" %} - {% block beforeContent %} {% include "content/_breadcrumb.njk" %} {% endblock %} diff --git a/app/views/content/formatting.njk b/app/views/content/formatting.njk index 03bbd8e7b..fdf7a80e9 100644 --- a/app/views/content/formatting.njk +++ b/app/views/content/formatting.njk @@ -1,11 +1,11 @@ +{% extends "layouts/app-layout.njk" %} + {% set pageTitle = "Formatting" %} {% set pageSection = "Content guide" %} {% set pageDescription = "Formatting and structuring text, including headings, links and lists." %} {% set dateUpdated = "July 2025" %} {% set backlog_issue_id = "322" %} -{% extends "layouts/app-layout.njk" %} - {% block beforeContent %} {% include "content/_breadcrumb.njk" %} {% endblock %} @@ -65,7 +65,6 @@For translations into languages that run right to left (like Arabic), right-align instead.
Find out more about text alignment in the design system.
-Use bold sparingly. Do not use italics or underlining (except for links, which are underlined by default).
Use bold in technical instructions to tell users which element (for example, a text input or button) to select. For example: Select More, then select Messages.
@@ -95,7 +94,6 @@ -Headings help users understand what the page covers and find the information they need. Use them to break up and structure text.
Make links active, specific and concise.
Links should describe where they're taking the user. Where you can, use the same words as the title of the page you're linking to. That way, the user will know what to expect.
@@ -256,7 +253,6 @@ - {% endblock %} {% block asideContent %} diff --git a/app/views/content/health-literacy.njk b/app/views/content/health-literacy.njk index 46562834f..8db81203b 100644 --- a/app/views/content/health-literacy.njk +++ b/app/views/content/health-literacy.njk @@ -1,11 +1,11 @@ +{% extends "layouts/app-layout.njk" %} + {% set pageTitle = "Health literacy" %} {% set pageSection = "Content guide" %} {% set pageDescription = "NHS services are for everyone. But many adults in the UK have low health literacy skills. This means they struggle to read and understand medical content intended for the public." %} {% set dateUpdated = "October 2023" %} {% set backlog_issue_id = "319" %} -{% extends "layouts/app-layout.njk" %} - {% block beforeContent %} {% include "content/_breadcrumb.njk" %} {% endblock %} diff --git a/app/views/content/how-to-write-good-questions-for-forms/consider-the-sensitivities-around-your-questions.njk b/app/views/content/how-to-write-good-questions-for-forms/consider-the-sensitivities-around-your-questions.njk index 34c916ce6..f097fc540 100644 --- a/app/views/content/how-to-write-good-questions-for-forms/consider-the-sensitivities-around-your-questions.njk +++ b/app/views/content/how-to-write-good-questions-for-forms/consider-the-sensitivities-around-your-questions.njk @@ -1,3 +1,5 @@ +{% extends "layouts/app-layout.njk" %} + {% set pageTitle = "Consider the sensitivities around your questions" %} {% set pageSection = "Content guide" %} {% set subSection = "How to write good questions for forms" %} @@ -5,8 +7,6 @@ {% set dateUpdated = "July 2025" %} {% set backlog_issue_id = "327" %} -{% extends "layouts/app-layout.njk" %} - {% block beforeContent %} {% include "content/how-to-write-good-questions-for-forms/_breadcrumb.njk" %} {% endblock %} @@ -75,8 +75,6 @@The sensitive topics reflect the "protected characteristics" in the Equality Act 2010. It is against the law to discriminate against anyone because of these characteristics.
- - {% endblock %} {% block afterContact %} diff --git a/app/views/content/how-to-write-good-questions-for-forms/get-the-questions-into-order.njk b/app/views/content/how-to-write-good-questions-for-forms/get-the-questions-into-order.njk index f7cce050c..d08f9acc5 100644 --- a/app/views/content/how-to-write-good-questions-for-forms/get-the-questions-into-order.njk +++ b/app/views/content/how-to-write-good-questions-for-forms/get-the-questions-into-order.njk @@ -1,3 +1,4 @@ +{% extends "layouts/app-layout.njk" %} {% set pageTitle = "Get the questions into order" %} {% set pageSection = "Content guide" %} @@ -6,8 +7,6 @@ {% set dateUpdated = "July 2025" %} {% set backlog_issue_id = "329" %} -{% extends "layouts/app-layout.njk" %} - {% block beforeContent %} {% include "content/how-to-write-good-questions-for-forms/_breadcrumb.njk" %} {% endblock %} @@ -57,8 +56,6 @@You need to understand which questions your users expect first and how they group them. One way to do this is with a card sorting exercise. Test the order again when you prototype your form.
For example, do users expect to give you personal details at the start or do they want to deal with the task first and give you personal details at the end?
- - {% endblock %} {% block afterContact %} diff --git a/app/views/content/how-to-write-good-questions-for-forms/index.njk b/app/views/content/how-to-write-good-questions-for-forms/index.njk index 8d3cae9db..b07d97df2 100644 --- a/app/views/content/how-to-write-good-questions-for-forms/index.njk +++ b/app/views/content/how-to-write-good-questions-for-forms/index.njk @@ -1,3 +1,5 @@ +{% extends "layouts/app-layout.njk" %} + {% set pageTitle = "How to write good questions for forms" %} {% set pageSection = "Content guide" %} {% set subSection = "How to write good questions for forms" %} @@ -6,8 +8,6 @@ {% set theme = "Content guide" %} {% set backlog_issue_id = "320" %} -{% extends "layouts/app-layout.njk" %} - {% block beforeContent %} {% include "content/_breadcrumb.njk" %} {% endblock %} @@ -23,7 +23,6 @@A form is a page that asks users for information in order to give them a service. It could be a web page or a paper page.
@@ -46,8 +45,6 @@There are some good resources on GOV.UK:
Read more about how people react to questions and produce an answer in "The Psychology of Survey Response" by Tourangeau, Rips and Rasinki (2000).
- - {% endblock %} {% block afterContact %} diff --git a/app/views/content/how-to-write-good-questions-for-forms/understand-the-problem-before-you-write-your-questions.njk b/app/views/content/how-to-write-good-questions-for-forms/understand-the-problem-before-you-write-your-questions.njk index 56c0cd29b..1c342a5eb 100644 --- a/app/views/content/how-to-write-good-questions-for-forms/understand-the-problem-before-you-write-your-questions.njk +++ b/app/views/content/how-to-write-good-questions-for-forms/understand-the-problem-before-you-write-your-questions.njk @@ -1,3 +1,5 @@ +{% extends "layouts/app-layout.njk" %} + {% set pageTitle = "Understand the problem before you write your questions" %} {% set pageSection = "Content guide" %} {% set subSection = "How to write good questions for forms" %} @@ -5,8 +7,6 @@ {% set dateUpdated = "November 2019" %} {% set backlog_issue_id = "325" %} -{% extends "layouts/app-layout.njk" %} - {% block beforeContent %} {% include "content/how-to-write-good-questions-for-forms/_breadcrumb.njk" %} {% endblock %} @@ -48,8 +48,6 @@GOV.UK has some good guidance on how the discovery phase works.
- - {% endblock %} {% block afterContact %} diff --git a/app/views/content/how-to-write-good-questions-for-forms/use-filter-questions-to-route-users.njk b/app/views/content/how-to-write-good-questions-for-forms/use-filter-questions-to-route-users.njk index f80df52dd..c39678d08 100644 --- a/app/views/content/how-to-write-good-questions-for-forms/use-filter-questions-to-route-users.njk +++ b/app/views/content/how-to-write-good-questions-for-forms/use-filter-questions-to-route-users.njk @@ -1,3 +1,5 @@ +{% extends "layouts/app-layout.njk" %} + {% set pageTitle = "Use filter questions to route users" %} {% set pageSection = "Content guide" %} {% set subSection = "How to write good questions for forms" %} @@ -5,8 +7,6 @@ {% set dateUpdated = "November 2019" %} {% set backlog_issue_id = "328" %} -{% extends "layouts/app-layout.njk" %} - {% block beforeContent %} {% include "content/how-to-write-good-questions-for-forms/_breadcrumb.njk" %} {% endblock %} @@ -34,7 +34,7 @@ Example {{ radios({ idPrefix: "example-research", - name: "example-research", + name: "exampleResearch", fieldset: { legend: { text: "Can we email you about research?", @@ -75,7 +75,7 @@ {{ radios({ idPrefix: "example-hints", - name: "example-hints", + name: "exampleHints", fieldset: { legend: { text: "Do you know your NHS number?", @@ -114,7 +114,7 @@ Example {{ radios({ idPrefix: "example-registration-details", - name: "example-registration-details", + name: "exampleRegistrationDetails", fieldset: { legend: { text: "Do you have your registration details?", @@ -141,8 +141,6 @@Read more about testing your questions.
If a lot of people cannot answer "Yes" or "No", reconsider your question.
- - {% endblock %} {% block afterContact %} diff --git a/app/views/content/how-to-write-good-questions-for-forms/write-the-supporting-content-for-your-form.njk b/app/views/content/how-to-write-good-questions-for-forms/write-the-supporting-content-for-your-form.njk index 4f1225b68..28f2a5ec8 100644 --- a/app/views/content/how-to-write-good-questions-for-forms/write-the-supporting-content-for-your-form.njk +++ b/app/views/content/how-to-write-good-questions-for-forms/write-the-supporting-content-for-your-form.njk @@ -1,3 +1,4 @@ +{% extends "layouts/app-layout.njk" %} {% set pageTitle = "Write the supporting content for your form" %} {% set pageSection = "Content guide" %} @@ -6,8 +7,6 @@ {% set dateUpdated = "July 2025" %} {% set backlog_issue_id = "331" %} -{% extends "layouts/app-layout.njk" %} - {% block beforeContent %} {% include "content/how-to-write-good-questions-for-forms/_breadcrumb.njk" %} {% endblock %} @@ -42,7 +41,7 @@ name: "contact", fieldset: { legend: { - text: "How would you like to be contacted?", + text: "How do you want to be contacted about this?", classes: "nhsuk-fieldset__legend--m" } }, @@ -118,8 +117,6 @@GOV.UK has some good guidance on designing how GOV.UK content and transactions work together.
- - {% endblock %} {% block afterContact %} diff --git a/app/views/content/how-we-write.njk b/app/views/content/how-we-write.njk index dc387cbd7..d0aaea421 100644 --- a/app/views/content/how-we-write.njk +++ b/app/views/content/how-we-write.njk @@ -1,11 +1,11 @@ +{% extends "layouts/app-layout.njk" %} + {% set pageTitle = "How we write" %} {% set pageSection = "Content guide" %} {% set pageDescription = "Everything we write follows these general principles." %} {% set dateUpdated = "August 2019" %} {% set backlog_issue_id = "315" %} -{% extends "layouts/app-layout.njk" %} - {% block beforeContent %} {% include "content/_breadcrumb.njk" %} {% endblock %} diff --git a/app/views/content/inclusive-content/age.njk b/app/views/content/inclusive-content/age.njk index 387aa9505..6c194073b 100644 --- a/app/views/content/inclusive-content/age.njk +++ b/app/views/content/inclusive-content/age.njk @@ -1,3 +1,5 @@ +{% extends "layouts/app-layout.njk" %} + {% set pageTitle = "Age" %} {% set pageSection = "Content guide" %} {% set pageDescription = "How to talk about stages of life and different age groups." %} @@ -5,8 +7,6 @@ {% set dateUpdated = "September 2024" %} {% set backlog_issue_id = "142" %} -{% extends "layouts/app-layout.njk" %} - {% block beforeContent %} {% include "content/inclusive-content/_breadcrumb.njk" %} {% endblock %} diff --git a/app/views/content/inclusive-content/disabilities-and-conditions.njk b/app/views/content/inclusive-content/disabilities-and-conditions.njk index c3d0b435b..c9983b27a 100644 --- a/app/views/content/inclusive-content/disabilities-and-conditions.njk +++ b/app/views/content/inclusive-content/disabilities-and-conditions.njk @@ -1,3 +1,5 @@ +{% extends "layouts/app-layout.njk" %} + {% set pageTitle = "Disabilities and conditions" %} {% set pageSection = "Content guide" %} {% set pageDescription = "Use positive language and do not label people with disabilities and conditions." %} @@ -5,8 +7,6 @@ {% set dateUpdated = "September 2021" %} {% set backlog_issue_id = "422" %} -{% extends "layouts/app-layout.njk" %} - {% block beforeContent %} {% include "content/inclusive-content/_breadcrumb.njk" %} {% endblock %} @@ -43,7 +43,6 @@NHS digital services should be accessible to everyone who needs them. Follow our guidance on accessibility for content designers, writers and editors in the digital service manual.
- {% endblock %} {% block asideContent %} diff --git a/app/views/content/inclusive-content/ethnicity-religion-and-nationality.njk b/app/views/content/inclusive-content/ethnicity-religion-and-nationality.njk index e033ed7ca..d72c66161 100644 --- a/app/views/content/inclusive-content/ethnicity-religion-and-nationality.njk +++ b/app/views/content/inclusive-content/ethnicity-religion-and-nationality.njk @@ -1,3 +1,5 @@ +{% extends "layouts/app-layout.njk" %} + {% set pageTitle = "Ethnicity, religion and nationality" %} {% set pageSection = "Content guide" %} {% set pageDescription = "When and how to refer to ethnicity, religion or nationality and when to use capital letters." %} @@ -5,8 +7,6 @@ {% set dateUpdated = "October 2023" %} {% set backlog_issue_id = "295" %} -{% extends "layouts/app-layout.njk" %} - {% block beforeContent %} {% include "content/inclusive-content/_breadcrumb.njk" %} {% endblock %} diff --git a/app/views/content/inclusive-content/index.njk b/app/views/content/inclusive-content/index.njk index 36acc240f..715e84a6d 100644 --- a/app/views/content/inclusive-content/index.njk +++ b/app/views/content/inclusive-content/index.njk @@ -1,3 +1,5 @@ +{% extends "layouts/app-layout.njk" %} + {% set pageTitle = "Inclusive content" %} {% set pageSection = "Content guide" %} {% set subSection = "Inclusive content" %} @@ -6,8 +8,6 @@ {% set theme = "Content guide" %} {% set backlog_issue_id = "317" %} -{% extends "layouts/app-layout.njk" %} - {% block beforeContent %} {% include "content/_breadcrumb.njk" %} {% endblock %} @@ -22,5 +22,4 @@ {% include "content/inclusive-content/_side-nav-mobile.njk" %} - {% endblock %} diff --git a/app/views/content/inclusive-content/sex-gender-and-sexuality.njk b/app/views/content/inclusive-content/sex-gender-and-sexuality.njk index 7bc927705..e49ed76c6 100644 --- a/app/views/content/inclusive-content/sex-gender-and-sexuality.njk +++ b/app/views/content/inclusive-content/sex-gender-and-sexuality.njk @@ -1,3 +1,5 @@ +{% extends "layouts/app-layout.njk" %} + {% set pageTitle = "Sex, gender and sexuality" %} {% set pageSection = "Content guide" %} {% set pageDescription = "The language around sex, gender and sexuality changes all the time. Stay in touch with the communities you are writing for." %} @@ -5,8 +7,6 @@ {% set dateUpdated = "September 2021" %} {% set backlog_issue_id = "143" %} -{% extends "layouts/app-layout.njk" %} - {% block beforeContent %} {% include "content/inclusive-content/_breadcrumb.njk" %} {% endblock %} diff --git a/app/views/content/inclusive-content/skin-symptoms.njk b/app/views/content/inclusive-content/skin-symptoms.njk index e8e802b40..7a45bd65d 100644 --- a/app/views/content/inclusive-content/skin-symptoms.njk +++ b/app/views/content/inclusive-content/skin-symptoms.njk @@ -1,3 +1,5 @@ +{% extends "layouts/app-layout.njk" %} + {% set pageTitle = "Skin symptoms" %} {% set pageSection = "Content guide" %} {% set pageDescription = "Make written content and imagery of skin symptoms inclusive for people with various skin tones and people with sight loss." %} @@ -5,8 +7,6 @@ {% set dateUpdated = "August 2025" %} {% set backlog_issue_id = "181" %} -{% extends "layouts/app-layout.njk" %} - {% block beforeContent %} {% include "content/inclusive-content/_breadcrumb.njk" %} {% endblock %} @@ -125,8 +125,6 @@Long descriptions tested well with screen reader users but the team is still testing them in content about skin symptoms.
- - {% endblock %} {% block asideContent %} diff --git a/app/views/content/index.njk b/app/views/content/index.njk index 13519cbab..20bb3261a 100644 --- a/app/views/content/index.njk +++ b/app/views/content/index.njk @@ -1,11 +1,11 @@ +{% extends "layouts/app-layout.njk" %} + {% set pageTitle = "Content guide" %} {% set pageDescription = "How to write for digital NHS services." %} {% set pageSection = "Content guide" %} {% set landingPage = true %} {% set hideContact = "true" %} -{% extends "layouts/app-layout.njk" %} - {% block bodyContent %}This guide is for anyone creating content for the NHS, to help make things clear and consistent across all of our services.
diff --git a/app/views/content/numbers-measurements-dates-time.njk b/app/views/content/numbers-measurements-dates-time.njk index 2a3fd1d57..541d4b973 100644 --- a/app/views/content/numbers-measurements-dates-time.njk +++ b/app/views/content/numbers-measurements-dates-time.njk @@ -1,11 +1,11 @@ +{% extends "layouts/app-layout.njk" %} + {% set pageTitle = "Numbers, measurements, dates and time" %} {% set pageSection = "Content guide" %} {% set pageDescription = "Content styles, including numerals, ordinals, dosage, temperature, fractions and percentages" %} {% set dateUpdated = "August 2023" %} {% set backlog_issue_id = "321" %} -{% extends "layouts/app-layout.njk" %} - {% block beforeContent %} {% include "content/_breadcrumb.njk" %} {% endblock %} diff --git a/app/views/content/pdfs-and-other-non-html-documents.njk b/app/views/content/pdfs-and-other-non-html-documents.njk index 77ef8c5e4..3af9eb80f 100644 --- a/app/views/content/pdfs-and-other-non-html-documents.njk +++ b/app/views/content/pdfs-and-other-non-html-documents.njk @@ -1,11 +1,11 @@ +{% extends "layouts/app-layout.njk" %} + {% set pageTitle = "PDFs and other non-HTML documents" %} {% set pageSection = "Content guide" %} {% set pageDescription = "HTML is the code for creating web pages. We avoid all non-HTML documents, including PDFs." %} {% set dateUpdated = "February 2025" %} {% set backlog_issue_id = "161" %} -{% extends "layouts/app-layout.njk" %} - {% block beforeContent %} {% include "content/_breadcrumb.njk" %} {% endblock %} diff --git a/app/views/content/punctuation.njk b/app/views/content/punctuation.njk index f518baaec..b6a5280dd 100644 --- a/app/views/content/punctuation.njk +++ b/app/views/content/punctuation.njk @@ -1,11 +1,11 @@ +{% extends "layouts/app-layout.njk" %} + {% set pageTitle = "Punctuation" %} {% set pageSection = "Content guide" %} {% set pageDescription = "Including capitalisation, contractions and hyphens." %} {% set dateUpdated = "April 2025" %} {% set backlog_issue_id = "322" %} -{% extends "layouts/app-layout.njk" %} - {% block beforeContent %} {% include "content/_breadcrumb.njk" %} {% endblock %} diff --git a/app/views/content/standard-for-creating-health-content.njk b/app/views/content/standard-for-creating-health-content.njk index c7adc0c4a..50158d10b 100644 --- a/app/views/content/standard-for-creating-health-content.njk +++ b/app/views/content/standard-for-creating-health-content.njk @@ -1,18 +1,17 @@ +{% extends "layouts/app-layout.njk" %} + {% set pageTitle = "Standard for creating health content" %} {% set pageSection = "Content guide" %} {% set pageDescription = "This standard outlines some essential requirements and best practice guidance for creating high quality health content. It's designed for any organisation that produces health and care information." %} {% set dateUpdated = "January 2024" %} {% set backlog_issue_id = "430" %} -{% extends "layouts/app-layout.njk" %} - {% block beforeContent %} {% include "content/_breadcrumb.njk" %} {% endblock %} {% block bodyContent %} -