Skip to content

Commit

Permalink
Remove quotes from nunjucks keys and update package number (#2005)
Browse files Browse the repository at this point in the history
* remove quotes from nunjuck keys

* update frontend package

* typo

* update package number and release date in changelog
  • Loading branch information
roshaanbajwa authored Jul 31, 2024
1 parent 31fc5ff commit 5544124
Show file tree
Hide file tree
Showing 134 changed files with 1,342 additions and 1,346 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# NHS digital service manual Changelog

## 6.5.0 - TBC
## 6.5.0 - 31 July 2024

:new: **New features**

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Original file line number Diff line number Diff line change
Expand Up @@ -57,25 +57,25 @@
<strong class="nhsuk-tag app-example__heading">Example</strong>
{% 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 %}
Expand Down Expand Up @@ -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 %}
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Original file line number Diff line number Diff line change
Expand Up @@ -33,22 +33,22 @@
<div class="app-example">
<strong class="nhsuk-tag app-example__heading">Example</strong>
{{ 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"
}
]
}) }}
Expand All @@ -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"
}
]
}) }}
Expand All @@ -113,22 +113,22 @@
<div class="app-example">
<strong class="nhsuk-tag app-example__heading">Example</strong>
{{ 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"
}
]
}) }}
Expand All @@ -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 %}
Original file line number Diff line number Diff line change
Expand Up @@ -31,29 +31,29 @@
<div class="app-example">
<strong class="nhsuk-tag app-example__heading">Example</strong>
{{ 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"
}
]
}) }}
Expand Down Expand Up @@ -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"
}
]
}) }}
Expand Down Expand Up @@ -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 %}



Original file line number Diff line number Diff line change
@@ -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: "#"
}) }}
4 changes: 2 additions & 2 deletions app/views/design-system/components/back-link/button/index.njk
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% from 'back-link/macro.njk' import backLink %}

{{ backLink({
"text": "Go back",
"element": "button"
text: "Go back",
element: "button"
}) }}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% from 'back-link/macro.njk' import backLink %}

{{ backLink({
"href": "#",
"text": "Go back"
href: "#",
text: "Go back"
}) }}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% from 'button/macro.njk' import button %}

{{ button({
"text": "Save and continue"
text: "Save and continue"
}) }}
Loading

0 comments on commit 5544124

Please sign in to comment.