Skip to content

Commit 27eb83d

Browse files
authored
Merge pull request #27 from TechnologyEnhancedLearning/TD-2217-accessibility-fix
TD-2217 accessibility fix for radio field-set and date input
2 parents 00cb0b9 + de2fb5f commit 27eb83d

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

NHSUKViewComponents.Web/Views/Shared/Components/DateInput/Default.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
@if (Model.HintTextLines != null) {
2727
@foreach (var hintText in Model.HintTextLines) {
28-
<div class="nhsuk-hint">
28+
<div class="nhsuk-hint" id="@Model.Id-hint">
2929
@hintText
3030
</div>
3131
}

NHSUKViewComponents.Web/Views/Shared/Components/ErrorSummary/Default.cshtml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,12 @@
1111
<ul class="nhsuk-list nhsuk-error-summary__list">
1212
@foreach (var item in Model.Errors.OrderBy(x => x.Key))
1313
{
14-
<li>
15-
<a href="#@item.Key">@item.ErrorMessage</a>
16-
</li>
14+
if (!string.IsNullOrWhiteSpace(item.ErrorMessage))
15+
{
16+
<li>
17+
<a href="#@item.Key">@item.ErrorMessage</a>
18+
</li>
19+
}
1720
}
1821
</ul>
1922
</div>

NHSUKViewComponents.Web/Views/Shared/Components/RadioList/Default.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<div class="nhsuk-form-group @(Model.HasError ? "nhsuk-form-group--error" : "")">
1111

12-
<fieldset class="nhsuk-fieldset" aria-describedby="@Model.Label.RemoveWhitespace()-hint">
12+
<fieldset class="nhsuk-fieldset" aria-describedby="@(!string.IsNullOrEmpty(Model.HintText) ? $"{Model.Label.RemoveWhitespace()}-hint" : string.Empty)">
1313
<legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--m">
1414
@if (Model.IsPageHeading.GetValueOrDefault() == true)
1515
{

0 commit comments

Comments
 (0)