Skip to content

HEEDLS-659 - fix accessibility issues on Current page and cards #813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 10, 2021
Merged

HEEDLS-659 - fix accessibility issues on Current page and cards #813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1bc73cf
HEEDLS-659 - fix accessibility issues on Current page and cards
DanBloxham-sw Dec 9, 2021
9cd24da
HEEDLS-659 - Add button role to Launch learning resource button
DanBloxham-sw Dec 9, 2021
af8be8e
Merge branch master into HEEDLS-659
DanBloxham-sw Dec 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/Views/LearningPortal/Current/Current.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<div class="nhsuk-grid-column-full">
<h1 id="page-heading">My Current Activities</h1>
@if (Model.BannerText != null) {
<h2 class="page-subheading">@Model.BannerText</h2>
<h2 class="page-subheading word-break">@Model.BannerText</h2>
}

@if (Model.NoDataFound) {
Expand Down
6 changes: 4 additions & 2 deletions ...ingSolutions.Web/Views/LearningPortal/Current/CurrentCourseCard/_CurrentCourseCard.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
<a class="nhsuk-button delete-button small-edit-button"
aria-describedby="@Model.Id-name-course"
asp-action="RemoveCurrentCourseConfirmation"
asp-route-id="@Model.Id">
asp-route-id="@Model.Id"
role="button">
Remove course
</a>
}
Expand All @@ -42,7 +43,8 @@
aria-describedby="@Model.Id-name-course"
asp-controller="LearningMenu"
asp-action="Index"
asp-route-customisationId="@Model.Id">
asp-route-customisationId="@Model.Id"
role="button">
Launch course
</a>
</div>
Expand Down
9 changes: 6 additions & 3 deletions ...talLearningSolutions.Web/Views/LearningPortal/Current/_CurrentLearningResourceCard.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,15 @@
</div>
</div>
<a class="nhsuk-button nhsuk-button--secondary small-edit-button nhsuk-u-margin-bottom-4"
aria-describedby="@Model.Id-name-lhr">
aria-describedby="@Model.Id-name-lhr"
role="button">
Mark as complete
</a>
<a class="nhsuk-button delete-button small-edit-button"
aria-describedby="@Model.Id-name-lhr"
asp-action="RemoveResourceFromActionPlan"
asp-route-learningLogItemId="@Model.Id">
asp-route-learningLogItemId="@Model.Id"
role="button">
Remove learning resource
</a>

Expand All @@ -49,7 +51,8 @@
<a class="nhsuk-button nhsuk-u-margin-bottom-2 nhsuk-u-margin-top-0"
aria-describedby="@Model.Id-name-lhr"
asp-action="LaunchLearningResource"
asp-route-learningLogItemId="@Model.Id">
asp-route-learningLogItemId="@Model.Id"
role="button">
Launch learning resource
</a>
</div>
Expand Down
3 changes: 2 additions & 1 deletion DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_SelfAssessmentCard.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
<a class="nhsuk-button nhsuk-u-margin-bottom-2 nhsuk-u-margin-top-0"
aria-describedby="@Model.Id-name-sa"
asp-action="SelfAssessment"
asp-route-selfAssessmentId="@Model.Id">
asp-route-selfAssessmentId="@Model.Id"
role="button">
Launch self assessment
</a>
</div>
Expand Down
17 changes: 14 additions & 3 deletions DigitalLearningSolutions.Web/Views/LearningPortal/Shared/_Dates.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,25 @@
@if (currentLearningItemViewModel is CurrentCourseViewModel course && (course.CompleteByDate == null || course.SelfEnrolled))
{
<div class="nhsuk-grid-column-one-half nhsuk-u-one-half">
<a class="nhsuk-button nhsuk-button--secondary small-edit-button" aria-describedby="@Model.Id-name" aria-label="Edit complete by date" asp-action="SetCurrentCourseCompleteByDate" asp-route-id="@Model.Id">
<a class="nhsuk-button nhsuk-button--secondary small-edit-button"
aria-describedby="@Model.Id-name"
aria-label="Edit complete by date"
asp-action="SetCurrentCourseCompleteByDate"
asp-route-id="@Model.Id"
role="button">
Edit
</a>
</div>
}
else if (currentLearningItemViewModel is SelfAssessmentCardViewModel)
{
<div class="nhsuk-grid-column-one-half nhsuk-u-one-half">
<a class="nhsuk-button nhsuk-button--secondary small-edit-button" aria-describedby="@Model.Id-name" aria-label="Edit complete by date" asp-route-selfAssessmentId="@Model.Id" asp-action="SetSelfAssessmentCompleteByDate">
<a class="nhsuk-button nhsuk-button--secondary small-edit-button"
aria-describedby="@Model.Id-name"
aria-label="Edit complete by date"
asp-route-selfAssessmentId="@Model.Id"
asp-action="SetSelfAssessmentCompleteByDate"
role="button">
Edit
</a>
</div>
Expand All @@ -53,7 +63,8 @@
<div class="nhsuk-grid-column-one-half nhsuk-u-one-half">
<a class="nhsuk-button nhsuk-button--secondary small-edit-button"
aria-describedby="@Model.Id-name"
aria-label="Edit complete by date">
aria-label="Edit complete by date"
role="button">
Edit
</a>
</div>
Expand Down