diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a73099a8..a123ef15e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # NHS digital service manual Changelog -## 6.5.0 - TBC +## 6.5.0 - 31 July 2024 :new: **New features** 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 330d159c5..822dd5b07 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 @@ -64,10 +64,10 @@ {% block afterContact %} {{ pagination({ - "previousUrl": "/content/how-to-write-good-questions-for-forms/use-filter-questions-to-route-users", - "previousPage": "Use filter questions to route users", - "nextUrl": "/content/how-to-write-good-questions-for-forms/think-of-the-form-as-a-conversation", - "nextPage": "Think of the form as a conversation" + previousUrl: "/content/how-to-write-good-questions-for-forms/use-filter-questions-to-route-users", + previousPage: "Use filter questions to route users", + nextUrl: "/content/how-to-write-good-questions-for-forms/think-of-the-form-as-a-conversation", + nextPage: "Think of the form as a conversation" }) }} {% endblock %} 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 09cfd7026..93738292d 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 @@ -53,8 +53,8 @@ {% block afterContact %} {{ pagination({ - "nextUrl": "/content/how-to-write-good-questions-for-forms/understand-the-problem-before-you-write-your-questions", - "nextPage": "Understand the problem before you write your questions" + nextUrl: "/content/how-to-write-good-questions-for-forms/understand-the-problem-before-you-write-your-questions", + nextPage: "Understand the problem before you write your questions" }) }} {% endblock %} diff --git a/app/views/content/how-to-write-good-questions-for-forms/make-sure-you-need-each-question.njk b/app/views/content/how-to-write-good-questions-for-forms/make-sure-you-need-each-question.njk index 3592ed35f..f3c7dc11a 100644 --- a/app/views/content/how-to-write-good-questions-for-forms/make-sure-you-need-each-question.njk +++ b/app/views/content/how-to-write-good-questions-for-forms/make-sure-you-need-each-question.njk @@ -57,25 +57,25 @@ Example {% call fieldset({ legend: { - "text": "Subscribe to newsletter", - "classes": "nhsuk-fieldset__legend--l" + text: "Subscribe to newsletter", + classes: "nhsuk-fieldset__legend--l" } }) %} {{ input({ label: { - "html": 'Name (optional)' + html: 'Name (optional)' }, - "id": "name", - "name": "name" + id: "name", + name: "name" }) }} {{ input({ label: { - "html": 'Email address' + html: 'Email address' }, - "id": "email", - "name": "email" + id: "email", + name: "email" }) }} {% endcall %} @@ -127,10 +127,10 @@ {% block afterContact %} {{ pagination({ - "previousUrl": "/content/how-to-write-good-questions-for-forms/understand-the-problem-before-you-write-your-questions", - "previousPage": "Understand the problem before you write your questions", - "nextUrl": "/content/how-to-write-good-questions-for-forms/consider-the-sensitivities-around-your-questions", - "nextPage": "Consider the sensitivities around your questions" + previousUrl: "/content/how-to-write-good-questions-for-forms/understand-the-problem-before-you-write-your-questions", + previousPage: "Understand the problem before you write your questions", + nextUrl: "/content/how-to-write-good-questions-for-forms/consider-the-sensitivities-around-your-questions", + nextPage: "Consider the sensitivities around your questions" }) }} {% endblock %} diff --git a/app/views/content/how-to-write-good-questions-for-forms/test-your-questions.njk b/app/views/content/how-to-write-good-questions-for-forms/test-your-questions.njk index 9de4656c3..66c184999 100644 --- a/app/views/content/how-to-write-good-questions-for-forms/test-your-questions.njk +++ b/app/views/content/how-to-write-good-questions-for-forms/test-your-questions.njk @@ -136,8 +136,8 @@ {% block afterContact %} {{ pagination({ - "previousUrl": "/content/how-to-write-good-questions-for-forms/write-the-supporting-content-for-your-form", - "previousPage": "Write the supporting content for your form" + previousUrl: "/content/how-to-write-good-questions-for-forms/write-the-supporting-content-for-your-form", + previousPage: "Write the supporting content for your form" }) }} {% endblock %} diff --git a/app/views/content/how-to-write-good-questions-for-forms/think-of-the-form-as-a-conversation.njk b/app/views/content/how-to-write-good-questions-for-forms/think-of-the-form-as-a-conversation.njk index a35660bfa..d9aef3d5d 100644 --- a/app/views/content/how-to-write-good-questions-for-forms/think-of-the-form-as-a-conversation.njk +++ b/app/views/content/how-to-write-good-questions-for-forms/think-of-the-form-as-a-conversation.njk @@ -166,10 +166,10 @@ {% block afterContact %} {{ pagination({ - "previousUrl": "/content/how-to-write-good-questions-for-forms/get-the-questions-into-order", - "previousPage": "Get the questions into order", - "nextUrl": "/content/how-to-write-good-questions-for-forms/write-the-supporting-content-for-your-form", - "nextPage": "Write the supporting content for your form" + previousUrl: "/content/how-to-write-good-questions-for-forms/get-the-questions-into-order", + previousPage: "Get the questions into order", + nextUrl: "/content/how-to-write-good-questions-for-forms/write-the-supporting-content-for-your-form", + nextPage: "Write the supporting content for your form" }) }} {% endblock %} 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 267672251..1536e933b 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 @@ -55,10 +55,10 @@ {% block afterContact %} {{ pagination({ - "previousUrl": "/content/how-to-write-good-questions-for-forms/index", - "previousPage": "How to write good questions for forms home page", - "nextUrl": "/content/how-to-write-good-questions-for-forms/make-sure-you-need-each-question", - "nextPage": "Make sure you need each question" + previousUrl: "/content/how-to-write-good-questions-for-forms/index", + previousPage: "How to write good questions for forms home page", + nextUrl: "/content/how-to-write-good-questions-for-forms/make-sure-you-need-each-question", + nextPage: "Make sure you need each question" }) }} {% endblock %} 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 6b2c41275..49648f734 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 @@ -33,22 +33,22 @@
Example {{ radios({ - "idPrefix": "example-research", - "name": "example-research", - "fieldset": { - "legend": { - "text": "Can we email you about research?", - "classes": "nhsuk-fieldset__legend--m" + idPrefix: "example-research", + name: "example-research", + fieldset: { + legend: { + text: "Can we email you about research?", + classes: "nhsuk-fieldset__legend--m" } }, - "items": [ + items: [ { - "value": "yes", - "text": "Yes, you can contact me by email about research" + value: "yes", + text: "Yes, you can contact me by email about research" }, { - "value": "no", - "text": "No, do not contact me about research" + value: "no", + text: "No, do not contact me about research" } ] }) }} @@ -74,30 +74,30 @@ {%- endset %} {{ radios({ - "idPrefix": "example-hints", - "name": "example-hints", - "fieldset": { - "legend": { - "text": "Do you know your NHS number?", - "classes": "nhsuk-fieldset__legend--l", - "isPageHeading": true + idPrefix: "example-hints", + name: "example-hints", + fieldset: { + legend: { + text: "Do you know your NHS number?", + classes: "nhsuk-fieldset__legend--l", + isPageHeading: true } }, - "hint": { - "html": hintHtml + hint: { + html: hintHtml }, - "items": [ + items: [ { - "value": "yes", - "text": "Yes, I know my NHS number" + value: "yes", + text: "Yes, I know my NHS number" }, { - "value": "no", - "text": "No, I do not know my NHS number" + value: "no", + text: "No, I do not know my NHS number" }, { - "value": "not sure", - "text": "I'm not sure" + value: "not sure", + text: "I'm not sure" } ] }) }} @@ -113,22 +113,22 @@
Example {{ radios({ - "idPrefix": "example-registration-details", - "name": "example-registration-details", - "fieldset": { - "legend": { - "text": "Do you have your registration details?", - "classes": "nhsuk-fieldset__legend--m" + idPrefix: "example-registration-details", + name: "example-registration-details", + fieldset: { + legend: { + text: "Do you have your registration details?", + classes: "nhsuk-fieldset__legend--m" } }, - "items": [ + items: [ { - "value": "yes", - "text": "Yes" + value: "yes", + text: "Yes" }, { - "value": "no", - "text": "No, try another way" + value: "no", + text: "No, try another way" } ] }) }} @@ -148,10 +148,10 @@ {% block afterContact %} {{ pagination({ - "previousUrl": "/content/how-to-write-good-questions-for-forms/consider-the-sensitivities-around-your-questions", - "previousPage": "Consider the sensitivities around your questions", - "nextUrl": "/content/how-to-write-good-questions-for-forms/get-the-questions-into-order", - "nextPage": "Get the questions into order" + previousUrl: "/content/how-to-write-good-questions-for-forms/consider-the-sensitivities-around-your-questions", + previousPage: "Consider the sensitivities around your questions", + nextUrl: "/content/how-to-write-good-questions-for-forms/get-the-questions-into-order", + nextPage: "Get the questions into order" }) }} {% endblock %} 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 b5ac858be..207db7d8b 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 @@ -31,29 +31,29 @@
Example {{ checkboxes({ - "idPrefix": "contact", - "name": "contact", - "fieldset": { - "legend": { - "text": "How would you like to be contacted?", - "classes": "nhsuk-fieldset__legend--m" + idPrefix: "contact", + name: "contact", + fieldset: { + legend: { + text: "How would you like to be contacted?", + classes: "nhsuk-fieldset__legend--m" } }, - "hint": { - "text": "Select all options that are relevant to you." + hint: { + text: "Select all options that are relevant to you." }, - "items": [ + items: [ { - "value": "email", - "text": "Email" + value: "email", + text: "Email" }, { - "value": "phone", - "text": "Phone" + value: "phone", + text: "Phone" }, { - "value": "text message", - "text": "Text message" + value: "text message", + text: "Text message" } ] }) }} @@ -83,30 +83,30 @@ {%- endset %} {{ radios({ - "idPrefix": "example-hints", - "name": "example-hints", - "fieldset": { - "legend": { - "text": "Do you know your NHS number?", - "classes": "nhsuk-fieldset__legend--l", - "isPageHeading": true + idPrefix: "example-hints", + name: "example-hints", + fieldset: { + legend: { + text: "Do you know your NHS number?", + classes: "nhsuk-fieldset__legend--l", + isPageHeading: true } }, - "hint": { - "html": hintHtml + hint: { + html: hintHtml }, - "items": [ + items: [ { - "value": "yes", - "text": "Yes, I know my NHS number" + value: "yes", + text: "Yes, I know my NHS number" }, { - "value": "no", - "text": "No, I do not know my NHS number" + value: "no", + text: "No, I do not know my NHS number" }, { - "value": "not sure", - "text": "I'm not sure" + value: "not sure", + text: "I'm not sure" } ] }) }} @@ -163,13 +163,10 @@ {% block afterContact %} {{ pagination({ - "previousUrl": "/content/how-to-write-good-questions-for-forms/think-of-the-form-as-a-conversation", - "previousPage": "Think of the form as a conversation", - "nextUrl": "/content/how-to-write-good-questions-for-forms/test-your-questions", - "nextPage": "Test your questions" + previousUrl: "/content/how-to-write-good-questions-for-forms/think-of-the-form-as-a-conversation", + previousPage: "Think of the form as a conversation", + nextUrl: "/content/how-to-write-good-questions-for-forms/test-your-questions", + nextPage: "Test your questions" }) }} {% endblock %} - - - diff --git a/app/views/design-system/components/action-link/default/index.njk b/app/views/design-system/components/action-link/default/index.njk index 9dfca327f..505a97013 100644 --- a/app/views/design-system/components/action-link/default/index.njk +++ b/app/views/design-system/components/action-link/default/index.njk @@ -1,6 +1,6 @@ {% from 'action-link/macro.njk' import actionLink %} {{ actionLink({ - "text": "Find a minor injuries unit", - "href": "#" + text: "Find a minor injuries unit", + href: "#" }) }} diff --git a/app/views/design-system/components/back-link/button/index.njk b/app/views/design-system/components/back-link/button/index.njk index 93925a3b9..42ae00ec7 100644 --- a/app/views/design-system/components/back-link/button/index.njk +++ b/app/views/design-system/components/back-link/button/index.njk @@ -1,6 +1,6 @@ {% from 'back-link/macro.njk' import backLink %} {{ backLink({ - "text": "Go back", - "element": "button" + text: "Go back", + element: "button" }) }} diff --git a/app/views/design-system/components/back-link/default/index.njk b/app/views/design-system/components/back-link/default/index.njk index 0a8964e1f..2348f9051 100644 --- a/app/views/design-system/components/back-link/default/index.njk +++ b/app/views/design-system/components/back-link/default/index.njk @@ -1,6 +1,6 @@ {% from 'back-link/macro.njk' import backLink %} {{ backLink({ - "href": "#", - "text": "Go back" + href: "#", + text: "Go back" }) }} diff --git a/app/views/design-system/components/buttons/default/index.njk b/app/views/design-system/components/buttons/default/index.njk index ed8eb797c..1bea0ac36 100644 --- a/app/views/design-system/components/buttons/default/index.njk +++ b/app/views/design-system/components/buttons/default/index.njk @@ -1,5 +1,5 @@ {% from 'button/macro.njk' import button %} {{ button({ - "text": "Save and continue" + text: "Save and continue" }) }} diff --git a/app/views/design-system/components/buttons/prevent-double-click/index.njk b/app/views/design-system/components/buttons/prevent-double-click/index.njk index 534048ad0..1da5873db 100644 --- a/app/views/design-system/components/buttons/prevent-double-click/index.njk +++ b/app/views/design-system/components/buttons/prevent-double-click/index.njk @@ -1,6 +1,6 @@ {% from 'button/macro.njk' import button %} {{ button({ - "text": "Save and continue", - "preventDoubleClick": true + text: "Save and continue", + preventDoubleClick: true }) }} diff --git a/app/views/design-system/components/buttons/reverse/index.njk b/app/views/design-system/components/buttons/reverse/index.njk index eba34596c..b39002c1c 100644 --- a/app/views/design-system/components/buttons/reverse/index.njk +++ b/app/views/design-system/components/buttons/reverse/index.njk @@ -1,6 +1,6 @@ {% from 'button/macro.njk' import button %} {{ button({ - "text": "Save and continue", - "classes": "nhsuk-button--reverse" + text: "Save and continue", + classes: "nhsuk-button--reverse" }) }} diff --git a/app/views/design-system/components/buttons/secondary/index.njk b/app/views/design-system/components/buttons/secondary/index.njk index 6fd4eb8c5..19af9552b 100644 --- a/app/views/design-system/components/buttons/secondary/index.njk +++ b/app/views/design-system/components/buttons/secondary/index.njk @@ -1,6 +1,6 @@ {% from 'button/macro.njk' import button %} {{ button({ - "text": "Find my location", - "classes": "nhsuk-button--secondary" + text: "Find my location", + classes: "nhsuk-button--secondary" }) }} diff --git a/app/views/design-system/components/card/clickable/index.njk b/app/views/design-system/components/card/clickable/index.njk index 34d7c7be0..b0389eeb9 100644 --- a/app/views/design-system/components/card/clickable/index.njk +++ b/app/views/design-system/components/card/clickable/index.njk @@ -1,9 +1,9 @@ {% from 'card/macro.njk' import card %} {{ card({ - "href": "#", - "clickable": "true", - "heading": "Introduction to care and support", - "headingClasses": "nhsuk-heading-m", - "description": "A quick guide for people who have care and support needs and their carers" + href: "#", + clickable: "true", + heading: "Introduction to care and support", + headingClasses: "nhsuk-heading-m", + description: "A quick guide for people who have care and support needs and their carers" }) }} diff --git a/app/views/design-system/components/card/default/index.njk b/app/views/design-system/components/card/default/index.njk index 5aa307096..b234ed804 100644 --- a/app/views/design-system/components/card/default/index.njk +++ b/app/views/design-system/components/card/default/index.njk @@ -1,7 +1,7 @@ {% from 'card/macro.njk' import card %} {{ card({ - "heading": "If you need help now, but it’s not an emergency", - "headingLevel": "3", - "descriptionHtml": "

Go to 111.nhs.uk or call 111

" + heading: "If you need help now, but it’s not an emergency", + headingLevel: "3", + descriptionHtml: "

Go to 111.nhs.uk or call 111

" }) }} diff --git a/app/views/design-system/components/card/group-half/index.njk b/app/views/design-system/components/card/group-half/index.njk index 004854668..f289ab673 100644 --- a/app/views/design-system/components/card/group-half/index.njk +++ b/app/views/design-system/components/card/group-half/index.njk @@ -3,42 +3,42 @@
  • {{ card({ - "href": "#", - "primary": "true", - "clickable": "true", - "heading": "Introduction to care and support", - "headingClasses": "nhsuk-heading-m", - "description": "A quick guide for people who have care and support needs and their carers" + href: "#", + primary: "true", + clickable: "true", + heading: "Introduction to care and support", + headingClasses: "nhsuk-heading-m", + description: "A quick guide for people who have care and support needs and their carers" }) }}
  • {{ card({ - "href": "#", - "primary": "true", - "clickable": "true", - "heading": "Help from social services and charities", - "headingClasses": "nhsuk-heading-m", - "description": "Includes helplines, needs assessments, advocacy and reporting abuse." + href: "#", + primary: "true", + clickable: "true", + heading: "Help from social services and charities", + headingClasses: "nhsuk-heading-m", + description: "Includes helplines, needs assessments, advocacy and reporting abuse." }) }}
  • {{ card({ - "href": "#", - "primary": "true", - "clickable": "true", - "heading": "Care services, equipment and care homes", - "headingClasses": "nhsuk-heading-m", - "description": "Includes home adaptations, help at home from a carer, social care you can get for free and housing." + href: "#", + primary: "true", + clickable: "true", + heading: "Care services, equipment and care homes", + headingClasses: "nhsuk-heading-m", + description: "Includes home adaptations, help at home from a carer, social care you can get for free and housing." }) }}
  • {{ card({ - "href": "#", - "primary": "true", - "clickable": "true", - "heading": "Money, work and benefits", - "headingClasses": "nhsuk-heading-m", - "description": "How to pay for care and support, and where you can get help with costs" + href: "#", + primary: "true", + clickable: "true", + heading: "Money, work and benefits", + headingClasses: "nhsuk-heading-m", + description: "How to pay for care and support, and where you can get help with costs" }) }}
diff --git a/app/views/design-system/components/card/group-quarter/index.njk b/app/views/design-system/components/card/group-quarter/index.njk index 3f49e5877..d8d14be52 100644 --- a/app/views/design-system/components/card/group-quarter/index.njk +++ b/app/views/design-system/components/card/group-quarter/index.njk @@ -3,26 +3,26 @@
  • {{ card({ - "clickable": "true", - "headingHtml": "

    91 Applicants

    Applicants" + clickable: "true", + headingHtml: "

    91 Applicants

    Applicants" }) }}
  • {{ card({ - "clickable": "true", - "headingHtml": "

    23 Jobs

    Jobs" + clickable: "true", + headingHtml: "

    23 Jobs

    Jobs" }) }}
  • {{ card({ - "clickable": "true", - "headingHtml": "

    8 Services

    Services" + clickable: "true", + headingHtml: "

    8 Services

    Services" }) }}
  • {{ card({ - "clickable": "true", - "headingHtml": "

    33 Messages

    Messages" + clickable: "true", + headingHtml: "

    33 Messages

    Messages" }) }}
diff --git a/app/views/design-system/components/card/group-third/index.njk b/app/views/design-system/components/card/group-third/index.njk index c7f813a4d..5ddde306f 100644 --- a/app/views/design-system/components/card/group-third/index.njk +++ b/app/views/design-system/components/card/group-third/index.njk @@ -3,29 +3,29 @@
  • {{ card({ - "href": "#", - "clickable": "true", - "heading": "5 steps to mental wellbeing", - "headingClasses": "nhsuk-heading-m", - "description": "Practical advice to help you feel mentally and emotionally better" + href: "#", + clickable: "true", + heading: "5 steps to mental wellbeing", + headingClasses: "nhsuk-heading-m", + description: "Practical advice to help you feel mentally and emotionally better" }) }}
  • {{ card({ - "href": "#", - "clickable": "true", - "heading": "Healthy weight", - "headingClasses": "nhsuk-heading-m", - "description": "Check your BMI using our healthy weight calculator and find out if you're a healthy weight" + href: "#", + clickable: "true", + heading: "Healthy weight", + headingClasses: "nhsuk-heading-m", + description: "Check your BMI using our healthy weight calculator and find out if you're a healthy weight" }) }}
  • {{ card({ - "href": "#", - "clickable": "true", - "heading": "Exercise", - "headingClasses": "nhsuk-heading-m", - "description": "Programmes, workouts and tips to get you moving and improve your fitness and wellbeing" + href: "#", + clickable: "true", + heading: "Exercise", + headingClasses: "nhsuk-heading-m", + description: "Programmes, workouts and tips to get you moving and improve your fitness and wellbeing" }) }}
diff --git a/app/views/design-system/components/card/heading-level/index.njk b/app/views/design-system/components/card/heading-level/index.njk index 756efb24c..c30cf0c7f 100644 --- a/app/views/design-system/components/card/heading-level/index.njk +++ b/app/views/design-system/components/card/heading-level/index.njk @@ -1,7 +1,7 @@ {% from 'card/macro.njk' import card %} {{ card({ - "heading": "Heading level 3", - "headingLevel": "3", - "description": "Card description text goes here" + heading: "Heading level 3", + headingLevel: "3", + description: "Card description text goes here" }) }} diff --git a/app/views/design-system/components/card/heading-size/index.njk b/app/views/design-system/components/card/heading-size/index.njk index 39e046ec9..539eabc2a 100644 --- a/app/views/design-system/components/card/heading-size/index.njk +++ b/app/views/design-system/components/card/heading-size/index.njk @@ -1,7 +1,7 @@ {% from 'card/macro.njk' import card %} {{ card({ - "heading": "Heading level", - "headingClasses": "nhsuk-heading-s", - "description": "Card description text goes here" + heading: "Heading level", + headingClasses: "nhsuk-heading-s", + description: "Card description text goes here" }) }} diff --git a/app/views/design-system/components/card/primary-card/index.njk b/app/views/design-system/components/card/primary-card/index.njk index 80dd99dc5..e50e71703 100644 --- a/app/views/design-system/components/card/primary-card/index.njk +++ b/app/views/design-system/components/card/primary-card/index.njk @@ -3,12 +3,12 @@
  • {{ card({ - "href": "#", - "primary": "true", - "clickable": "true", - "heading": "Introduction to care and support", - "headingClasses": "nhsuk-heading-m", - "description": "A quick guide for people who have care and support needs and their carers" + href: "#", + primary: "true", + clickable: "true", + heading: "Introduction to care and support", + headingClasses: "nhsuk-heading-m", + description: "A quick guide for people who have care and support needs and their carers" }) }}
diff --git a/app/views/design-system/components/card/secondary-card/index.njk b/app/views/design-system/components/card/secondary-card/index.njk index b636a0940..167e9f21f 100644 --- a/app/views/design-system/components/card/secondary-card/index.njk +++ b/app/views/design-system/components/card/secondary-card/index.njk @@ -3,12 +3,12 @@
  • {{ card({ - "href": "#", - "clickable": "true", - "secondary": "true", - "heading": "Urgent and emergency care services", - "headingClasses": "nhsuk-heading-m", - "description": "Services the NHS provides if you need urgent or emergency medical help" + href: "#", + clickable: "true", + secondary: "true", + heading: "Urgent and emergency care services", + headingClasses: "nhsuk-heading-m", + description: "Services the NHS provides if you need urgent or emergency medical help" }) }}
diff --git a/app/views/design-system/components/card/top-task/index.njk b/app/views/design-system/components/card/top-task/index.njk index 91ea3d842..a05745600 100644 --- a/app/views/design-system/components/card/top-task/index.njk +++ b/app/views/design-system/components/card/top-task/index.njk @@ -3,11 +3,11 @@
  • {{ card({ - "href": "#", - "clickable": "true", - "headingLevel": 5, - "heading": "Order a repeat prescription", - "headingClasses": "nhsuk-heading-xs" + href: "#", + clickable: "true", + headingLevel: 5, + heading: "Order a repeat prescription", + headingClasses: "nhsuk-heading-xs" }) }}
\ No newline at end of file diff --git a/app/views/design-system/components/card/with-image/index.njk b/app/views/design-system/components/card/with-image/index.njk index abec6b1d4..d1632b9f0 100644 --- a/app/views/design-system/components/card/with-image/index.njk +++ b/app/views/design-system/components/card/with-image/index.njk @@ -1,10 +1,10 @@ {% from 'card/macro.njk' import card %} {{ card({ - "imgURL": "https://assets.nhs.uk/prod/images/A_0218_exercise-main_FKW1X7.width-690.jpg", - "href": "#", - "clickable": "true", - "heading": "Exercise", - "headingClasses": "nhsuk-heading-m", - "description": "Programmes, workouts and tips to get you moving and improve your fitness and wellbeing" + imgURL: "https://assets.nhs.uk/prod/images/A_0218_exercise-main_FKW1X7.width-690.jpg", + href: "#", + clickable: "true", + heading: "Exercise", + headingClasses: "nhsuk-heading-m", + description: "Programmes, workouts and tips to get you moving and improve your fitness and wellbeing" }) }} diff --git a/app/views/design-system/components/character-count/default/index.njk b/app/views/design-system/components/character-count/default/index.njk index 43e2496dd..b81605cf8 100644 --- a/app/views/design-system/components/character-count/default/index.njk +++ b/app/views/design-system/components/character-count/default/index.njk @@ -1,15 +1,15 @@ {% from 'character-count/macro.njk' import characterCount %} {{ characterCount({ - "name": "more-detail", - "id": "more-detail", - "maxlength": 200, - "label": { - "text": "Can you provide more detail?", - "classes": "nhsuk-label--l", - "isPageHeading": "true" + name: "more-detail", + id: "more-detail", + maxlength: 200, + label: { + text: "Can you provide more detail?", + classes: "nhsuk-label--l", + isPageHeading: "true" }, - "hint": { - "text": "Do not include personal information like your name, date of birth or NHS number." + hint: { + text: "Do not include personal information like your name, date of birth or NHS number." } }) }} \ No newline at end of file diff --git a/app/views/design-system/components/character-count/error/index.njk b/app/views/design-system/components/character-count/error/index.njk index 41ccc7ad0..b1bd52800 100644 --- a/app/views/design-system/components/character-count/error/index.njk +++ b/app/views/design-system/components/character-count/error/index.njk @@ -1,18 +1,18 @@ {% from 'character-count/macro.njk' import characterCount %} {{ characterCount({ - "name": "exceeding-characters", - "id": "exceeding", - "maxlength": 350, - "value": "A content designer works on the end-to-end journey of a service to help users complete their goal and government deliver a policy intent. Their work may involve the creation of, or change to, a transaction, product or single piece of content that stretches across digital and offline channels. They make sure appropriate content is shown to a user in the right place and in the best format.", - "label": { - "text": "Enter a job description", - "classes": "nhsuk-label--l" + name: "exceeding-characters", + id: "exceeding", + maxlength: 350, + value: "A content designer works on the end-to-end journey of a service to help users complete their goal and government deliver a policy intent. Their work may involve the creation of, or change to, a transaction, product or single piece of content that stretches across digital and offline channels. They make sure appropriate content is shown to a user in the right place and in the best format.", + label: { + text: "Enter a job description", + classes: "nhsuk-label--l" }, - "hint": { - "text": "Do not include personal information like your name, date of birth or NHS number." + hint: { + text: "Do not include personal information like your name, date of birth or NHS number." }, - "errorMessage": { - "text": "Job description must be 350 characters or less" + errorMessage: { + text: "Job description must be 350 characters or less" } }) }} \ No newline at end of file diff --git a/app/views/design-system/components/character-count/threshold/index.njk b/app/views/design-system/components/character-count/threshold/index.njk index 2c2dd50fb..5d5a7b5ce 100644 --- a/app/views/design-system/components/character-count/threshold/index.njk +++ b/app/views/design-system/components/character-count/threshold/index.njk @@ -1,13 +1,13 @@ {% from 'character-count/macro.njk' import characterCount %} {{ characterCount({ - "name": "threshold", - "id": "threshold", - "maxlength": 112, - "threshold": 75, - "value": "Type another letter into this field after this message to see the threshold feature", - "label": { - "text": "Can you provide more detail?", - "classes": "nhsuk-label--l" + name: "threshold", + id: "threshold", + maxlength: 112, + threshold: 75, + value: "Type another letter into this field after this message to see the threshold feature", + label: { + text: "Can you provide more detail?", + classes: "nhsuk-label--l" } }) }} \ No newline at end of file diff --git a/app/views/design-system/components/character-count/without-heading/index.njk b/app/views/design-system/components/character-count/without-heading/index.njk index 80d378229..352f3e29d 100644 --- a/app/views/design-system/components/character-count/without-heading/index.njk +++ b/app/views/design-system/components/character-count/without-heading/index.njk @@ -1,10 +1,10 @@ {% from 'character-count/macro.njk' import characterCount %} {{ characterCount({ - "name": "more-detail", - "id": "more-detail", - "maxlength": 150, - "label": { - "text": "Tell us more about what happened." + name: "more-detail", + id: "more-detail", + maxlength: 150, + label: { + text: "Tell us more about what happened." } }) }} diff --git a/app/views/design-system/components/character-count/word-count/index.njk b/app/views/design-system/components/character-count/word-count/index.njk index 5f7b89b60..2780589d7 100644 --- a/app/views/design-system/components/character-count/word-count/index.njk +++ b/app/views/design-system/components/character-count/word-count/index.njk @@ -1,11 +1,11 @@ {% from 'character-count/macro.njk' import characterCount %} {{ characterCount({ - "name": "more-detail", - "id": "more-detail", - "maxwords": 150, - "label": { - "text": "Enter a job description", - "classes": "nhsuk-label--l" + name: "more-detail", + id: "more-detail", + maxwords: 150, + label: { + text: "Enter a job description", + classes: "nhsuk-label--l" } }) }} diff --git a/app/views/design-system/components/checkboxes/conditional/index.njk b/app/views/design-system/components/checkboxes/conditional/index.njk index 21cc916c0..58f0fcb61 100644 --- a/app/views/design-system/components/checkboxes/conditional/index.njk +++ b/app/views/design-system/components/checkboxes/conditional/index.njk @@ -36,22 +36,22 @@
{{ checkboxes({ - "idPrefix": "contact", - "name": "contact", - "fieldset": { - "legend": { - "text": "How would you prefer to be contacted?", - "classes": "nhsuk-fieldset__legend--l", - "isPageHeading": "true" + idPrefix: "contact", + name: "contact", + fieldset: { + legend: { + text: "How would you prefer to be contacted?", + classes: "nhsuk-fieldset__legend--l", + isPageHeading: "true" } }, - "hint": { - "text": "Select all options that are relevant to you." + hint: { + text: "Select all options that are relevant to you." }, - "items": [ + items: [ { - "value": "email", - "text": "Email", + value: "email", + text: "Email", "conditional": { "html": emailHtml } diff --git a/app/views/design-system/components/checkboxes/default/index.njk b/app/views/design-system/components/checkboxes/default/index.njk index bfe146322..f058aaf2e 100644 --- a/app/views/design-system/components/checkboxes/default/index.njk +++ b/app/views/design-system/components/checkboxes/default/index.njk @@ -2,30 +2,30 @@ {{ checkboxes({ - "idPrefix": "example", - "name": "example", - "fieldset": { - "legend": { - "text": "How would you like to be contacted?", - "classes": "nhsuk-fieldset__legend--l", + idPrefix: "example", + name: "example", + fieldset: { + legend: { + text: "How would you like to be contacted?", + classes: "nhsuk-fieldset__legend--l", isPageHeading: true } }, - "hint": { - "text": "Select all options that are relevant to you." + hint: { + text: "Select all options that are relevant to you." }, - "items": [ + items: [ { - "value": "email", - "text": "Email" + value: "email", + text: "Email" }, { - "value": "phone", - "text": "Phone" + value: "phone", + text: "Phone" }, { - "value": "text message", - "text": "Text message" + value: "text message", + text: "Text message" } ] }) }} diff --git a/app/views/design-system/components/checkboxes/error-messages/index.njk b/app/views/design-system/components/checkboxes/error-messages/index.njk index 36b3fbc37..dfe075dec 100644 --- a/app/views/design-system/components/checkboxes/error-messages/index.njk +++ b/app/views/design-system/components/checkboxes/error-messages/index.njk @@ -2,34 +2,34 @@ {{ checkboxes({ - "idPrefix": "contact", - "name": "contact", - "fieldset": { - "legend": { - "text": "How would you like to be contacted?", - "classes": "nhsuk-fieldset__legend--l", + idPrefix: "contact", + name: "contact", + fieldset: { + legend: { + text: "How would you like to be contacted?", + classes: "nhsuk-fieldset__legend--l", isPageHeading: true } }, - "hint": { - "text": "Select all options that are relevant to you." + hint: { + text: "Select all options that are relevant to you." }, - "errorMessage": { - "text": "Select how you like to be contacted" + errorMessage: { + text: "Select how you like to be contacted" }, - "items": [ + items: [ { - "value": "email", - "text": "Email", + value: "email", + text: "Email", id: "contact" }, { - "value": "phone", - "text": "Phone" + value: "phone", + text: "Phone" }, { - "value": "text message", - "text": "Text message" + value: "text message", + text: "Text message" } ] }) }} diff --git a/app/views/design-system/components/checkboxes/hint/index.njk b/app/views/design-system/components/checkboxes/hint/index.njk index 1a9fe73de..e0d64f7ac 100644 --- a/app/views/design-system/components/checkboxes/hint/index.njk +++ b/app/views/design-system/components/checkboxes/hint/index.njk @@ -2,31 +2,31 @@ {{ checkboxes({ - "idPrefix": "contact", - "name": "contact", - "fieldset": { - "legend": { - "text": "How would you like to be contacted?", - "classes": "nhsuk-fieldset__legend--l", + idPrefix: "contact", + name: "contact", + fieldset: { + legend: { + text: "How would you like to be contacted?", + classes: "nhsuk-fieldset__legend--l", isPageHeading: true } }, - "hint": { - "text": "Select all options that are relevant to you." + hint: { + text: "Select all options that are relevant to you." }, - "items": [ + items: [ { - "value": "email", - "text": "Email", + value: "email", + text: "Email", id: "contact" }, { - "value": "phone", - "text": "Phone" + value: "phone", + text: "Phone" }, { - "value": "text message", - "text": "Text message" + value: "text message", + text: "Text message" } ] }) }} diff --git a/app/views/design-system/components/date-input/default/index.njk b/app/views/design-system/components/date-input/default/index.njk index 484864658..d3141eb83 100644 --- a/app/views/design-system/components/date-input/default/index.njk +++ b/app/views/design-system/components/date-input/default/index.njk @@ -1,30 +1,30 @@ {% from 'date-input/macro.njk' import dateInput %} {{ dateInput({ - "id": "example", - "namePrefix": "example", - "fieldset": { - "legend": { - "text": "What is your date of birth?", - "classes": "nhsuk-label--l", - "isPageHeading": true + id: "example", + namePrefix: "example", + fieldset: { + legend: { + text: "What is your date of birth?", + classes: "nhsuk-label--l", + isPageHeading: true } }, - "hint": { - "text": "For example, 15 3 1984" + hint: { + text: "For example, 15 3 1984" }, - "items": [ + items: [ { - "name": "day", - "classes": "nhsuk-input--width-2" + name: "day", + classes: "nhsuk-input--width-2" }, { - "name": "month", - "classes": "nhsuk-input--width-2" + name: "month", + classes: "nhsuk-input--width-2" }, { - "name": "year", - "classes": "nhsuk-input--width-4" + name: "year", + classes: "nhsuk-input--width-4" } ] }) }} diff --git a/app/views/design-system/components/date-input/with-errors/index.njk b/app/views/design-system/components/date-input/with-errors/index.njk index 570d4b1aa..1e7d61abe 100644 --- a/app/views/design-system/components/date-input/with-errors/index.njk +++ b/app/views/design-system/components/date-input/with-errors/index.njk @@ -1,32 +1,32 @@ {% from 'date-input/macro.njk' import dateInput %} {{ dateInput({ - "id": "dob-errors", - "fieldset": { - "legend": { - "text": "What is your date of birth?", - "classes": "nhsuk-label--l", - "isPageHeading": true + id: "dob-errors", + fieldset: { + legend: { + text: "What is your date of birth?", + classes: "nhsuk-label--l", + isPageHeading: true } }, - "hint": { - "text": "For example, 15 3 1984" + hint: { + text: "For example, 15 3 1984" }, - "errorMessage": { - "text": "Enter your date of birth" + errorMessage: { + text: "Enter your date of birth" }, - "items": [ + items: [ { - "name": "day", - "classes": "nhsuk-input--width-2 nhsuk-input--error" + name: "day", + classes: "nhsuk-input--width-2 nhsuk-input--error" }, { - "name": "month", - "classes": "nhsuk-input--width-2 nhsuk-input--error" + name: "month", + classes: "nhsuk-input--width-2 nhsuk-input--error" }, { - "name": "year", - "classes": "nhsuk-input--width-4 nhsuk-input--error" + name: "year", + classes: "nhsuk-input--width-4 nhsuk-input--error" } ] }) }} diff --git a/app/views/design-system/components/details/default/index.njk b/app/views/design-system/components/details/default/index.njk index 1b271827d..2ac47567f 100644 --- a/app/views/design-system/components/details/default/index.njk +++ b/app/views/design-system/components/details/default/index.njk @@ -1,8 +1,8 @@ {% from 'details/macro.njk' import details %} {{ details({ - "text": "How to find your NHS number", - "HTML": " + text: "How to find your NHS number", + HTML: "

An NHS number is a 10 digit number, like 485 777 3456.

You can find your NHS number by logging in to a GP online service or on any document the NHS has sent you, such as your:

    diff --git a/app/views/design-system/components/do-and-dont-lists/default/index.njk b/app/views/design-system/components/do-and-dont-lists/default/index.njk index 0de193aaa..004fc810e 100644 --- a/app/views/design-system/components/do-and-dont-lists/default/index.njk +++ b/app/views/design-system/components/do-and-dont-lists/default/index.njk @@ -1,36 +1,36 @@ {% from 'do-dont-list/macro.njk' import list %} {{ list({ - "title": "Do", - "type": "tick", - "items": [ + title: "Do", + type: "tick", + items: [ { - "item": "cover blisters that are likely to burst with a soft plaster or dressing" + item: "cover blisters that are likely to burst with a soft plaster or dressing" }, { - "item": "wash your hands before touching a burst blister" + item: "wash your hands before touching a burst blister" }, { - "item": "allow the fluid in a burst blister to drain before covering it with a plaster or dressing" + item: "allow the fluid in a burst blister to drain before covering it with a plaster or dressing" } ] }) }} {{ list({ - "title": "Don't", - "type": "cross", - "items": [ + title: "Don't", + type: "cross", + items: [ { - "item": "burst a blister yourself" + item: "burst a blister yourself" }, { - "item": "peel the skin off a burst blister" + item: "peel the skin off a burst blister" }, { - "item": "pick at the edges of the remaining skin" + item: "pick at the edges of the remaining skin" }, { - "item": "wear the shoes or use the equipment that caused your blister until it heals" + item: "wear the shoes or use the equipment that caused your blister until it heals" } ] }) }} diff --git a/app/views/design-system/components/error-message/default/index.njk b/app/views/design-system/components/error-message/default/index.njk index 974494d66..8ea02aaa0 100644 --- a/app/views/design-system/components/error-message/default/index.njk +++ b/app/views/design-system/components/error-message/default/index.njk @@ -1,5 +1,5 @@ {% from 'error-message/macro.njk' import errorMessage %} {{ errorMessage({ - "text": "Date of birth must be in the past" + text: "Date of birth must be in the past" }) }} diff --git a/app/views/design-system/components/error-message/error-summary-placement-input/index.njk b/app/views/design-system/components/error-message/error-summary-placement-input/index.njk index 14dd027d8..678209c1b 100644 --- a/app/views/design-system/components/error-message/error-summary-placement-input/index.njk +++ b/app/views/design-system/components/error-message/error-summary-placement-input/index.njk @@ -7,9 +7,9 @@ {% block beforeContent %} {{ backLink({ - "href": "#", - "text": "Go back", - "classes": "nhsuk-u-margin-bottom-0 nhsuk-u-margin-top-4" + href: "#", + text: "Go back", + classes: "nhsuk-u-margin-bottom-0 nhsuk-u-margin-top-4" }) }} {% endblock %} @@ -19,11 +19,11 @@ {{ errorSummary({ - "titleText": "There is a problem", - "errorList": [ + titleText: "There is a problem", + errorList: [ { - "text": "Enter your full name", - "href": "#name" + text: "Enter your full name", + href: "#name" } ] }) }} @@ -31,18 +31,18 @@

    Your details

    {{ input({ - "label": { - "text": "Full name" + label: { + text: "Full name" }, - "id": "name", - "name": "name", - "errorMessage": { - "text": "Enter your full name" + id: "name", + name: "name", + errorMessage: { + text: "Enter your full name" } }) }} {{ button({ - "text": "Continue" + text: "Continue" }) }} diff --git a/app/views/design-system/components/error-message/error-summary-placement-multiple/index.njk b/app/views/design-system/components/error-message/error-summary-placement-multiple/index.njk index 1afee07d2..fd6a22c3d 100644 --- a/app/views/design-system/components/error-message/error-summary-placement-multiple/index.njk +++ b/app/views/design-system/components/error-message/error-summary-placement-multiple/index.njk @@ -7,9 +7,9 @@ {% block beforeContent %} {{ backLink({ - "href": "#", - "text": "Go back", - "classes": "nhsuk-u-margin-bottom-0 nhsuk-u-margin-top-4" + href: "#", + text: "Go back", + classes: "nhsuk-u-margin-bottom-0 nhsuk-u-margin-top-4" }) }} {% endblock %} @@ -19,15 +19,15 @@
    {{ errorSummary({ - "titleText": "There is a problem", - "errorList": [ + titleText: "There is a problem", + errorList: [ { - "text": "Enter your first name", - "href": "#first-name" + text: "Enter your first name", + href: "#first-name" }, { - "text": "Enter your last name", - "href": "#last-name" + text: "Enter your last name", + href: "#last-name" } ] }) }} @@ -35,33 +35,32 @@

    Your details

    {{ input({ - "label": { - "text": "First name" + label: { + text: "First name" }, - "id": "first-name", - "name": "first-name", - "errorMessage": { - "text": "Enter your first name" + id: "first-name", + name: "first-name", + errorMessage: { + text: "Enter your first name" } }) }} {{ input({ - "label": { - "text": "Last name" + label: { + text: "Last name" }, - "id": "last-name", - "name": "last-name", - "errorMessage": { - "text": "Enter your last name" + id: "last-name", + name: "last-name", + errorMessage: { + text: "Enter your last name" } }) }} {{ button({ - "text": "Continue" + text: "Continue" }) }}
{% endblock %} - diff --git a/app/views/design-system/components/error-message/error-summary-placement/index.njk b/app/views/design-system/components/error-message/error-summary-placement/index.njk index e2a9b4a2e..c0bcb6767 100644 --- a/app/views/design-system/components/error-message/error-summary-placement/index.njk +++ b/app/views/design-system/components/error-message/error-summary-placement/index.njk @@ -7,9 +7,9 @@ {% block beforeContent %} {{ backLink({ - "href": "#", - "text": "Go back", - "classes": "nhsuk-u-margin-bottom-0 nhsuk-u-margin-top-4" + href: "#", + text: "Go back", + classes: "nhsuk-u-margin-bottom-0 nhsuk-u-margin-top-4" }) }} {% endblock %} @@ -19,50 +19,50 @@
{{ errorSummary({ - "titleText": "There is a problem", - "errorList": [ + titleText: "There is a problem", + errorList: [ { - "text": "Date of birth must include a year", - "href": "#dob-errors-year" + text: "Date of birth must include a year", + href: "#dob-errors-year" } ] }) }} {{ dateInput({ - "id": "dob-errors", - "fieldset": { - "legend": { - "text": "What is your date of birth?", - "classes": "nhsuk-fieldset__legend--l", - "isPageHeading": true + id: "dob-errors", + fieldset: { + legend: { + text: "What is your date of birth?", + classes: "nhsuk-fieldset__legend--l", + isPageHeading: true } }, - "hint": { - "text": "For example, 15 3 1984" + hint: { + text: "For example, 15 3 1984" }, - "errorMessage": { - "text": "Date of birth must include a year" + errorMessage: { + text: "Date of birth must include a year" }, - "items": [ + items: [ { - "name": "day", - "classes": "nhsuk-input--width-2", + name: "day", + classes: "nhsuk-input--width-2", value: 15 }, { - "name": "month", - "classes": "nhsuk-input--width-2", + name: "month", + classes: "nhsuk-input--width-2", value: 3 }, { - "name": "year", - "classes": "nhsuk-input--width-4 nhsuk-input--error" + name: "year", + classes: "nhsuk-input--width-4 nhsuk-input--error" } ] }) }} {{ button({ - "text": "Continue" + text: "Continue" }) }}
diff --git a/app/views/design-system/components/error-message/in-context/index.njk b/app/views/design-system/components/error-message/in-context/index.njk index b017d2fc0..5ec90a547 100644 --- a/app/views/design-system/components/error-message/in-context/index.njk +++ b/app/views/design-system/components/error-message/in-context/index.njk @@ -2,35 +2,35 @@ {% from 'date-input/macro.njk' import dateInput %} {{ dateInput({ - "id": "dob-day-error", - "namePrefix": "dob-day-error", - "fieldset": { - "legend": { - "text": "What is your date of birth?", - "classes": "nhsuk-fieldset__legend--l", - "isPageHeading": true + id: "dob-day-error", + namePrefix: "dob-day-error", + fieldset: { + legend: { + text: "What is your date of birth?", + classes: "nhsuk-fieldset__legend--l", + isPageHeading: true } }, - "hint": { - "text": "For example, 31 3 1980" + hint: { + text: "For example, 31 3 1980" }, - "errorMessage": { - "text": "Date of birth must be in the past" + errorMessage: { + text: "Date of birth must be in the past" }, - "items": [ + items: [ { - "name": "day", - "classes": "nhsuk-input--width-2 nhsuk-input--error", + name: "day", + classes: "nhsuk-input--width-2 nhsuk-input--error", value: 15 }, { - "name": "month", - "classes": "nhsuk-input--width-2 nhsuk-input--error", + name: "month", + classes: "nhsuk-input--width-2 nhsuk-input--error", value: 3 }, { - "name": "year", - "classes": "nhsuk-input--width-4 nhsuk-input--error", + name: "year", + classes: "nhsuk-input--width-4 nhsuk-input--error", value: 2084 } ] diff --git a/app/views/design-system/components/error-message/input/index.njk b/app/views/design-system/components/error-message/input/index.njk index 73a2a17bd..4f57df214 100644 --- a/app/views/design-system/components/error-message/input/index.njk +++ b/app/views/design-system/components/error-message/input/index.njk @@ -1,12 +1,12 @@ {% from 'input/macro.njk' import input %} {{ input({ - "label": { - "text": "Full name" + label: { + text: "Full name" }, - "id": "example", - "name": "example", - "errorMessage": { - "text": "Enter your full name" + id: "example", + name: "example", + errorMessage: { + text: "Enter your full name" } }) }} diff --git a/app/views/design-system/components/error-message/radios/index.njk b/app/views/design-system/components/error-message/radios/index.njk index d4293f840..0329e84f7 100644 --- a/app/views/design-system/components/error-message/radios/index.njk +++ b/app/views/design-system/components/error-message/radios/index.njk @@ -1,29 +1,29 @@ {% from 'radios/macro.njk' import radios %} {{ radios({ - "idPrefix": "example-error", - "name": "example-error", - "errorMessage": { - "text": "Select yes if you have changed your name" + idPrefix: "example-error", + name: "example-error", + errorMessage: { + text: "Select yes if you have changed your name" }, - "fieldset": { - "legend": { - "text": "Have you changed your name?", - "classes": "nhsuk-fieldset__legend--l", - "isPageHeading": true + fieldset: { + legend: { + text: "Have you changed your name?", + classes: "nhsuk-fieldset__legend--l", + isPageHeading: true } }, - "hint": { - "text": "This includes changing your last name or spelling your name differently." + hint: { + text: "This includes changing your last name or spelling your name differently." }, - "items": [ + items: [ { - "value": "yes", - "text": "Yes" + value: "yes", + text: "Yes" }, { - "value": "no", - "text": "No" + value: "no", + text: "No" } ] }) }} diff --git a/app/views/design-system/components/error-summary/default/index.njk b/app/views/design-system/components/error-summary/default/index.njk index f32c947e6..0240369cd 100644 --- a/app/views/design-system/components/error-summary/default/index.njk +++ b/app/views/design-system/components/error-summary/default/index.njk @@ -1,12 +1,12 @@ {% from 'error-summary/macro.njk' import errorSummary %} {{ errorSummary({ - "titleText": "There is a problem", - "descriptionText": "Describe the errors and how to correct them", - "errorList": [ + titleText: "There is a problem", + descriptionText: "Describe the errors and how to correct them", + errorList: [ { - "text": "Date of birth must be in the past", - "href": "#example-error-1" + text: "Date of birth must be in the past", + href: "#example-error-1" } ] }) }} diff --git a/app/views/design-system/components/error-summary/link-input/index.njk b/app/views/design-system/components/error-summary/link-input/index.njk index fe6cdc410..77fb51ab8 100644 --- a/app/views/design-system/components/error-summary/link-input/index.njk +++ b/app/views/design-system/components/error-summary/link-input/index.njk @@ -2,11 +2,11 @@ {% from 'input/macro.njk' import input %} {{ errorSummary({ - "titleText": "There is a problem", - "errorList": [ + titleText: "There is a problem", + errorList: [ { - "text": "Enter your full name", - "href": "#name" + text: "Enter your full name", + href: "#name" } ] }) }} @@ -14,12 +14,12 @@

Your details

{{ input({ - "label": { - "text": "Full name" + label: { + text: "Full name" }, - "id": "name", - "name": "name", - "errorMessage": { - "text": "Enter your full name" + id: "name", + name: "name", + errorMessage: { + text: "Enter your full name" } }) }} diff --git a/app/views/design-system/components/error-summary/link-multiple-input/index.njk b/app/views/design-system/components/error-summary/link-multiple-input/index.njk index 4e7bc9e03..b0598eaa7 100644 --- a/app/views/design-system/components/error-summary/link-multiple-input/index.njk +++ b/app/views/design-system/components/error-summary/link-multiple-input/index.njk @@ -2,44 +2,44 @@ {% from 'date-input/macro.njk' import dateInput %} {{ errorSummary({ - "titleText": "There is a problem", - "errorList": [ + titleText: "There is a problem", + errorList: [ { - "text": "Date of birth must include a year", - "href": "#dob-errors-year" + text: "Date of birth must include a year", + href: "#dob-errors-year" } ] }) }} {{ dateInput({ - "id": "dob-errors", - "fieldset": { - "legend": { - "text": "What is your date of birth?", - "classes": "nhsuk-fieldset__legend--l", - "isPageHeading": true + id: "dob-errors", + fieldset: { + legend: { + text: "What is your date of birth?", + classes: "nhsuk-fieldset__legend--l", + isPageHeading: true } }, - "hint": { - "text": "For example, 15 3 1984" + hint: { + text: "For example, 15 3 1984" }, - "errorMessage": { - "text": "Date of birth must include a year" + errorMessage: { + text: "Date of birth must include a year" }, - "items": [ + items: [ { - "name": "day", - "classes": "nhsuk-input--width-2", + name: "day", + classes: "nhsuk-input--width-2", value: 15 }, { - "name": "month", - "classes": "nhsuk-input--width-2", + name: "month", + classes: "nhsuk-input--width-2", value: 3 }, { - "name": "year", - "classes": "nhsuk-input--width-4 nhsuk-input--error" + name: "year", + classes: "nhsuk-input--width-4 nhsuk-input--error" } ] }) }} diff --git a/app/views/design-system/components/error-summary/link-options/index.njk b/app/views/design-system/components/error-summary/link-options/index.njk index 363a4a409..643ccb608 100644 --- a/app/views/design-system/components/error-summary/link-options/index.njk +++ b/app/views/design-system/components/error-summary/link-options/index.njk @@ -2,44 +2,44 @@ {% from 'checkboxes/macro.njk' import checkboxes %} {{ errorSummary({ - "titleText": "There is a problem", - "errorList": [ + titleText: "There is a problem", + errorList: [ { - "text": "Select how you like to be contacted", - "href": "#contact" + text: "Select how you like to be contacted", + href: "#contact" } ] }) }} {{ checkboxes({ - "idPrefix": "contact", - "name": "contact", - "fieldset": { - "legend": { - "text": "How would you like to be contacted?", - "classes": "nhsuk-fieldset__legend--l", + idPrefix: "contact", + name: "contact", + fieldset: { + legend: { + text: "How would you like to be contacted?", + classes: "nhsuk-fieldset__legend--l", isPageHeading: true } }, - "hint": { - "text": "Select all options that are relevant to you." + hint: { + text: "Select all options that are relevant to you." }, - "errorMessage": { - "text": "Select how you like to be contacted" + errorMessage: { + text: "Select how you like to be contacted" }, - "items": [ + items: [ { - "value": "email", - "text": "Email", + value: "email", + text: "Email", id: "contact" }, { - "value": "phone", - "text": "Phone" + value: "phone", + text: "Phone" }, { - "value": "text message", - "text": "Text message" + value: "text message", + text: "Text message" } ] }) }} diff --git a/app/views/design-system/components/error-summary/placement-input/index.njk b/app/views/design-system/components/error-summary/placement-input/index.njk index 14dd027d8..678209c1b 100644 --- a/app/views/design-system/components/error-summary/placement-input/index.njk +++ b/app/views/design-system/components/error-summary/placement-input/index.njk @@ -7,9 +7,9 @@ {% block beforeContent %} {{ backLink({ - "href": "#", - "text": "Go back", - "classes": "nhsuk-u-margin-bottom-0 nhsuk-u-margin-top-4" + href: "#", + text: "Go back", + classes: "nhsuk-u-margin-bottom-0 nhsuk-u-margin-top-4" }) }} {% endblock %} @@ -19,11 +19,11 @@
{{ errorSummary({ - "titleText": "There is a problem", - "errorList": [ + titleText: "There is a problem", + errorList: [ { - "text": "Enter your full name", - "href": "#name" + text: "Enter your full name", + href: "#name" } ] }) }} @@ -31,18 +31,18 @@

Your details

{{ input({ - "label": { - "text": "Full name" + label: { + text: "Full name" }, - "id": "name", - "name": "name", - "errorMessage": { - "text": "Enter your full name" + id: "name", + name: "name", + errorMessage: { + text: "Enter your full name" } }) }} {{ button({ - "text": "Continue" + text: "Continue" }) }}
diff --git a/app/views/design-system/components/error-summary/placement-multiple/index.njk b/app/views/design-system/components/error-summary/placement-multiple/index.njk index 1afee07d2..cb20ac9fa 100644 --- a/app/views/design-system/components/error-summary/placement-multiple/index.njk +++ b/app/views/design-system/components/error-summary/placement-multiple/index.njk @@ -7,9 +7,9 @@ {% block beforeContent %} {{ backLink({ - "href": "#", - "text": "Go back", - "classes": "nhsuk-u-margin-bottom-0 nhsuk-u-margin-top-4" + href: "#", + text: "Go back", + classes: "nhsuk-u-margin-bottom-0 nhsuk-u-margin-top-4" }) }} {% endblock %} @@ -19,15 +19,15 @@
{{ errorSummary({ - "titleText": "There is a problem", - "errorList": [ + titleText: "There is a problem", + errorList: [ { - "text": "Enter your first name", - "href": "#first-name" + text: "Enter your first name", + href: "#first-name" }, { - "text": "Enter your last name", - "href": "#last-name" + text: "Enter your last name", + href: "#last-name" } ] }) }} @@ -35,29 +35,29 @@

Your details

{{ input({ - "label": { - "text": "First name" + label: { + text: "First name" }, - "id": "first-name", - "name": "first-name", - "errorMessage": { - "text": "Enter your first name" + id: "first-name", + name: "first-name", + errorMessage: { + text: "Enter your first name" } }) }} {{ input({ - "label": { - "text": "Last name" + label: { + text: "Last name" }, - "id": "last-name", - "name": "last-name", - "errorMessage": { - "text": "Enter your last name" + id: "last-name", + name: "last-name", + errorMessage: { + text: "Enter your last name" } }) }} {{ button({ - "text": "Continue" + text: "Continue" }) }}
diff --git a/app/views/design-system/components/error-summary/placement/index.njk b/app/views/design-system/components/error-summary/placement/index.njk index e2a9b4a2e..c0bcb6767 100644 --- a/app/views/design-system/components/error-summary/placement/index.njk +++ b/app/views/design-system/components/error-summary/placement/index.njk @@ -7,9 +7,9 @@ {% block beforeContent %} {{ backLink({ - "href": "#", - "text": "Go back", - "classes": "nhsuk-u-margin-bottom-0 nhsuk-u-margin-top-4" + href: "#", + text: "Go back", + classes: "nhsuk-u-margin-bottom-0 nhsuk-u-margin-top-4" }) }} {% endblock %} @@ -19,50 +19,50 @@
{{ errorSummary({ - "titleText": "There is a problem", - "errorList": [ + titleText: "There is a problem", + errorList: [ { - "text": "Date of birth must include a year", - "href": "#dob-errors-year" + text: "Date of birth must include a year", + href: "#dob-errors-year" } ] }) }} {{ dateInput({ - "id": "dob-errors", - "fieldset": { - "legend": { - "text": "What is your date of birth?", - "classes": "nhsuk-fieldset__legend--l", - "isPageHeading": true + id: "dob-errors", + fieldset: { + legend: { + text: "What is your date of birth?", + classes: "nhsuk-fieldset__legend--l", + isPageHeading: true } }, - "hint": { - "text": "For example, 15 3 1984" + hint: { + text: "For example, 15 3 1984" }, - "errorMessage": { - "text": "Date of birth must include a year" + errorMessage: { + text: "Date of birth must include a year" }, - "items": [ + items: [ { - "name": "day", - "classes": "nhsuk-input--width-2", + name: "day", + classes: "nhsuk-input--width-2", value: 15 }, { - "name": "month", - "classes": "nhsuk-input--width-2", + name: "month", + classes: "nhsuk-input--width-2", value: 3 }, { - "name": "year", - "classes": "nhsuk-input--width-4 nhsuk-input--error" + name: "year", + classes: "nhsuk-input--width-4 nhsuk-input--error" } ] }) }} {{ button({ - "text": "Continue" + text: "Continue" }) }}
diff --git a/app/views/design-system/components/expander/default/index.njk b/app/views/design-system/components/expander/default/index.njk index 91878f588..36534bc0d 100644 --- a/app/views/design-system/components/expander/default/index.njk +++ b/app/views/design-system/components/expander/default/index.njk @@ -1,9 +1,9 @@ {% from 'details/macro.njk' import details %} {{ details({ - "classes": "nhsuk-expander", - "text": "Get your medical records", - "HTML": " + classes: "nhsuk-expander", + text: "Get your medical records", + HTML: "

You can see your GP records by:

{{ card({ - "feature": "true", - "heading": "D", - "headingClasses": "nhsuk-u-font-size-24", - "descriptionHtml": "