Skip to content

Commit a3ca67f

Browse files
sc15zssc15zs
authored
Merge pull request #181 from communitiesuk/FLS-1052-Mark-as-complete-clarity
Change radio buttons on confirmation page to match new design
2 parents 4eabc30 + 61a0453 commit a3ca67f

File tree

3 files changed

+118
-105
lines changed

3 files changed

+118
-105
lines changed

‎runner/locales/cy.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,12 @@
8383
"itemOne": "The assessor has asked you to make a change to specific parts of this section.",
8484
"itemTwo": "The pages where you need to make a change will be highlighted.",
8585
"itemThree": "You do not need to make changes to any other pages."
86-
}
86+
},
87+
"sectionCompletedField": {
88+
"yes": "Yes, I’ve completed this section",
89+
"no": "No, I’ll come back to it later",
90+
"hint": "You can still edit this section before submitting your application."
91+
}
8792
},
8893
"head": {
8994
"banner": {

‎runner/locales/en.json‎

Lines changed: 104 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,105 @@
11
{
2-
"signOut": "Sign out",
3-
"markAsComplete": "Do you want to mark this section as complete ?",
4-
"removeText": "Remove",
5-
"validation": {
6-
"required": "{#label} is required",
7-
"max": "{#label} must be {#limit} characters or less",
8-
"min": "{#label} must be {#limit} characters or more",
9-
"regex": "enter a valid {#label}",
10-
"email": "{#label} must be a valid email address",
11-
"number": "{#label} must be a number",
12-
"numberMin": "{#label} must be {#limit} or higher",
13-
"numberMax": "{#label} must be {#limit} or lower",
14-
"format": "Enter a valid {#label}",
15-
"maxWords": "{#label} must be {#limit} words or fewer",
16-
"dateRequired": "{#label} must be a real date",
17-
"dateFormat": "{#label} must be a real date",
18-
"dateMin": "{#label} must be the same as or after {#limit}",
19-
"dateMax": "{#label} must be the same as or before {#limit}",
20-
"selectRequired": "{#label} is required",
21-
"title1": "There is a problem",
22-
"title2": "Fix the following errors",
23-
"fileUpload": {
24-
"filePartiallyUploadError": "The files have not fully uploaded",
25-
"fileUploadSizeError": "File must be under ",
26-
"fileUploadCombinedSizeError": "Combined filesize must be under ",
27-
"fileUploadTypeError": "You can't upload files of this type.",
28-
"fileUploadCountSingleError": "You can only upload a single file",
29-
"fileUploadCountMaxError": "You can only upload {maxFiles} files",
30-
"fileUploadCountMinError": "{labelText} requires {minimumRequiredFiles} files",
31-
"fileUploadSelectedFileMaxError": "The selected file must be smaller than {size}MB"
32-
},
33-
"ukAddressField": {
34-
"invalidPostCodeError": "Enter a valid postcode"
35-
},
36-
"telephoneNumberField": {
37-
"incorrectFormat": "Enter a telephone number in the correct format"
38-
}
39-
},
40-
"components": {
41-
"clientSideFileUpload": {
42-
"javascriptEnableMessageTitle": "You need to have JavaScript enabled to see your selected files",
43-
"description1": "Why is JavaScript required?",
44-
"description2": "Without JavaScript, you will be able to select files to upload, but you won't be able to see them on this page.",
45-
"description3": "Your files will still be uploaded when you hit \"Save and continue\". If you revisit this page, you will be able to see your previously uploaded files.",
46-
"fileUploadBtn": "Choose file",
47-
"filesUploadBtn": "Choose files",
48-
"table": {
49-
"fileNameCol": "File name",
50-
"fileSizeCol": "File size",
51-
"fileProgressCol": "Progress",
52-
"fileActionCol": "Action",
53-
"fileActionComplete": "Complete",
54-
"fileActionFailed": "Failed",
55-
"deleteBtn": "Delete"
56-
}
57-
},
58-
"freeTextField": {
59-
"wordCountReminder": "You have {count} words remaining",
60-
"wordCountRemainingError": "You have {count} words too many",
61-
"wordCountError": "You can enter up to {count} words",
62-
"error": "Error:"
63-
},
64-
"markAsComplete": {
65-
"error": "You must select yes or no"
66-
},
67-
"declaration": {
68-
"error": "You must declare to be able to submit this application"
69-
},
70-
"ukAddressField": {
71-
"addressLine1": "Address line 1",
72-
"addressLine2": "Address line 2",
73-
"townOrCity": "Town or city",
74-
"county": "County",
75-
"postcode": "Postcode"
76-
},
77-
"yesOrNoField": {
78-
"yes": "Yes",
79-
"no": "No"
80-
},
81-
"changeRequestpage": {
82-
"title": "We need you to make changes",
83-
"itemOne": "The assessor has asked you to make a change to specific parts of this section.",
84-
"itemTwo": "The pages where you need to make a change will be highlighted.",
85-
"itemThree": "You do not need to make changes to any other pages."
86-
}
87-
},
88-
"head": {
89-
"banner": {
90-
"title": "This is a new service.",
91-
"tag": "beta"
92-
}
93-
},
94-
"footer": {
95-
"privacy": "Privacy",
96-
"cookies": "Cookies",
97-
"accessibilityStatement": "Accessibility Statement",
98-
"contactUs": "Contact Us"
99-
}
100-
}
2+
"signOut": "Sign out",
3+
"markAsComplete": "Have you completed this section?",
4+
"removeText": "Remove",
5+
"validation": {
6+
"required": "{#label} is required",
7+
"max": "{#label} must be {#limit} characters or less",
8+
"min": "{#label} must be {#limit} characters or more",
9+
"regex": "enter a valid {#label}",
10+
"email": "{#label} must be a valid email address",
11+
"number": "{#label} must be a number",
12+
"numberMin": "{#label} must be {#limit} or higher",
13+
"numberMax": "{#label} must be {#limit} or lower",
14+
"format": "Enter a valid {#label}",
15+
"maxWords": "{#label} must be {#limit} words or fewer",
16+
"dateRequired": "{#label} must be a real date",
17+
"dateFormat": "{#label} must be a real date",
18+
"dateMin": "{#label} must be the same as or after {#limit}",
19+
"dateMax": "{#label} must be the same as or before {#limit}",
20+
"selectRequired": "{#label} is required",
21+
"title1": "There is a problem",
22+
"title2": "Fix the following errors",
23+
"fileUpload": {
24+
"filePartiallyUploadError": "The files have not fully uploaded",
25+
"fileUploadSizeError": "File must be under ",
26+
"fileUploadCombinedSizeError": "Combined filesize must be under ",
27+
"fileUploadTypeError": "You can't upload files of this type.",
28+
"fileUploadCountSingleError": "You can only upload a single file",
29+
"fileUploadCountMaxError": "You can only upload {maxFiles} files",
30+
"fileUploadCountMinError": "{labelText} requires {minimumRequiredFiles} files",
31+
"fileUploadSelectedFileMaxError": "The selected file must be smaller than {size}MB"
32+
},
33+
"ukAddressField": {
34+
"invalidPostCodeError": "Enter a valid postcode"
35+
},
36+
"telephoneNumberField": {
37+
"incorrectFormat": "Enter a telephone number in the correct format"
38+
}
39+
},
40+
"components": {
41+
"clientSideFileUpload": {
42+
"javascriptEnableMessageTitle": "You need to have JavaScript enabled to see your selected files",
43+
"description1": "Why is JavaScript required?",
44+
"description2": "Without JavaScript, you will be able to select files to upload, but you won't be able to see them on this page.",
45+
"description3": "Your files will still be uploaded when you hit \"Save and continue\". If you revisit this page, you will be able to see your previously uploaded files.",
46+
"fileUploadBtn": "Choose file",
47+
"filesUploadBtn": "Choose files",
48+
"table": {
49+
"fileNameCol": "File name",
50+
"fileSizeCol": "File size",
51+
"fileProgressCol": "Progress",
52+
"fileActionCol": "Action",
53+
"fileActionComplete": "Complete",
54+
"fileActionFailed": "Failed",
55+
"deleteBtn": "Delete"
56+
}
57+
},
58+
"freeTextField": {
59+
"wordCountReminder": "You have {count} words remaining",
60+
"wordCountRemainingError": "You have {count} words too many",
61+
"wordCountError": "You can enter up to {count} words",
62+
"error": "Error:"
63+
},
64+
"markAsComplete": {
65+
"error": "You must select yes or no"
66+
},
67+
"declaration": {
68+
"error": "You must declare to be able to submit this application"
69+
},
70+
"ukAddressField": {
71+
"addressLine1": "Address line 1",
72+
"addressLine2": "Address line 2",
73+
"townOrCity": "Town or city",
74+
"county": "County",
75+
"postcode": "Postcode"
76+
},
77+
"yesOrNoField": {
78+
"yes": "Yes",
79+
"no": "No"
80+
},
81+
"changeRequestpage": {
82+
"title": "We need you to make changes",
83+
"itemOne": "The assessor has asked you to make a change to specific parts of this section.",
84+
"itemTwo": "The pages where you need to make a change will be highlighted.",
85+
"itemThree": "You do not need to make changes to any other pages."
86+
},
87+
"sectionCompletedField": {
88+
"yes": "Yes, I’ve completed this section",
89+
"no": "No, I’ll come back to it later",
90+
"hint": "You can still edit this section before submitting your application."
91+
}
92+
},
93+
"head": {
94+
"banner": {
95+
"title": "This is a new service.",
96+
"tag": "beta"
97+
}
98+
},
99+
"footer": {
100+
"privacy": "Privacy",
101+
"cookies": "Cookies",
102+
"accessibilityStatement": "Accessibility Statement",
103+
"contactUs": "Contact Us"
104+
}
105+
}

‎runner/src/server/views/summary.html‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,32 +98,35 @@ <h2 class="govuk-heading-m" id="declaration">Declaration</h2>
9898
{% endif %}
9999

100100
{% if markAsCompleteComponent %}
101-
<div class="govuk-form-group {{ 'govuk-form-group--error' if markAsCompleteError }}">
101+
<div class="govuk-!-margin-top-9 govuk-form-group {{ 'govuk-form-group--error' if markAsCompleteError }}">
102102
{% if markAsCompleteError %}
103103
<span id="nationality-error" class="govuk-error-message">
104104
<span class="govuk-visually-hidden">Error:</span> {{ markAsCompleteError }}</span>
105105
{% endif %}
106106
<fieldset class="govuk-fieldset">
107-
<legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
107+
<legend class="govuk-fieldset__legend govuk-fieldset__legend--m">
108108
<h1 class="govuk-fieldset__heading">
109109
{{ i18nGetTranslation("markAsComplete") }}
110110
</h1>
111111
</legend>
112-
<div class="govuk-radios govuk-radios--inline" data-module="govuk-radios">
112+
<div class="govuk-radios" data-module="govuk-radios">
113113
<div class="govuk-radios__item">
114114
<input class="govuk-radios__input" id="markAsComplete-yes"
115115
name="markAsComplete" type="radio" value="true"
116116
{% if markAsComplete %}checked{% endif %}>
117117
<label class="govuk-label govuk-radios__label" for="markAsComplete-yes">
118-
{{ i18nGetTranslation("components.yesOrNoField.yes") }}
118+
{{ i18nGetTranslation("components.sectionCompletedField.yes") }}
119119
</label>
120+
<div class="govuk-hint govuk-radios__hint">
121+
{{ i18nGetTranslation("components.sectionCompletedField.hint") }}
122+
</div>
120123
</div>
121124
<div class="govuk-radios__item">
122125
<input class="govuk-radios__input" id="markAsComplete-no"
123126
name="markAsComplete" type="radio" value="false"
124127
{% if markAsComplete == false %}checked{% endif %}>
125128
<label class="govuk-label govuk-radios__label" for="markAsComplete-no">
126-
{{ i18nGetTranslation("components.yesOrNoField.no") }}
129+
{{ i18nGetTranslation("components.sectionCompletedField.no") }}
127130
</label>
128131
</div>
129132
</div>

0 commit comments

Comments
 (0)