Skip to content

Fix learner catalogue pages accessibility issues #109

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
Parent: Merge Releases/phoenix Changes to CI
merged 1 commit into from
Feb 13, 2024
Merged

Fix learner catalogue pages accessibility issues #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,12 +163,13 @@

@* Tab header *@
<nav class="subnavbarwhite navbar-expand-md navbar-toggleable-md nhsuk-u-margin-bottom-1">
<input class="subnav-hidden-checkbox" id="resources-subnav-hidden-checkbox" role="button" type="checkbox" aria-controls="catalogue-details">
<input class="subnav-hidden-checkbox" id="resources-subnav-hidden-checkbox" role="button" type="checkbox" aria-controls="catalogue-details" aria-labelledby="resources-subnav-hidden-checkbox-label">
<div class="bar">
<div class="navbar-toggler navbar-toggler-left">@GetActiveTabName()</div>
<label class="navbar-toggler navbar-toggler-right" for="resources-subnav-hidden-checkbox">
<label class="navbar-toggler navbar-toggler-right" id="resources-subnav-hidden-checkbox-label" for="resources-subnav-hidden-checkbox">
<i class="fa-solid fa-chevron-down"></i>
<i class="fa-solid fa-chevron-up display--hide"></i>
<span class="nhsuk-u-visually-hidden">label</span>
</label>
</div>
<div class="navbar-collapse collapse" id="catalogue-details">
Expand Down
4 changes: 2 additions & 2 deletions LearningHub.Nhs.WebUI/Views/Home/_CatalogueTray.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
<h2>Catalogues</h2>

<nav class="subnavbarwhite navbar-expand-md nhsuk-u-margin-bottom-5">
<input class="subnav-hidden-checkbox" id="catalogues-subnav-hidden-checkbox" role="button" type="checkbox" aria-controls="collapsingCataloguesSubNavbar">
<input class="subnav-hidden-checkbox" id="catalogues-subnav-hidden-checkbox" role="button" type="checkbox" aria-controls="collapsingCataloguesSubNavbar" aria-labelledby="catalogues-subnav-hidden-checkbox-label">
<div class="bar">
<div class="navbar-toggler navbar-toggler-left nhsuk-u-font-size-19">@GetActiveTabName()</div>
<label class="navbar-toggler navbar-toggler-right" for="catalogues-subnav-hidden-checkbox">
<label class="navbar-toggler navbar-toggler-right" id="catalogues-subnav-hidden-checkbox-label" for="catalogues-subnav-hidden-checkbox">
<i class="fa-solid fa-chevron-down"><span class="nhsuk-u-visually-hidden">Show Catalogue Options</span></i>
<i class="fa-solid fa-chevron-up display--hide"><span class="nhsuk-u-visually-hidden">Hide Catalogue Options</span></i>

Expand Down
4 changes: 2 additions & 2 deletions LearningHub.Nhs.WebUI/Views/Home/_MyAccessedLearningTray.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
<h2>My accessed learning</h2>

<nav class="subnavbarwhite nhsuk-bg-grey navbar-expand-md nhsuk-u-margin-bottom-5">
<input class="subnav-hidden-checkbox" id="mylearning-subnav-hidden-checkbox" role="button" type="checkbox" aria-controls="collapsingMyLearningSubNavbar">
<input class="subnav-hidden-checkbox" id="mylearning-subnav-hidden-checkbox" role="button" type="checkbox" aria-controls="collapsingMyLearningSubNavbar" aria-labelledby="mylearning-subnav-hidden-checkbox-label">
<div class="bar">
<div class="navbar-toggler navbar-toggler-left nhsuk-u-font-size-19">@GetActiveTabName()</div>
<label class="navbar-toggler navbar-toggler-right" for="mylearning-subnav-hidden-checkbox">
<label class="navbar-toggler navbar-toggler-right" id="mylearning-subnav-hidden-checkbox-label" for="mylearning-subnav-hidden-checkbox">
<i class="fa-solid fa-chevron-down"><span class="nhsuk-u-visually-hidden">Show Resource Options</span></i>
<i class="fa-solid fa-chevron-up display--hide"><span class="nhsuk-u-visually-hidden">Hide Resource Options</span></i>
</label>
Expand Down
4 changes: 2 additions & 2 deletions LearningHub.Nhs.WebUI/Views/Home/_ResourceTray.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
<h2>Resources</h2>

<nav class="subnavbarwhite navbar-expand-md nhsuk-u-margin-bottom-5">
<input class="subnav-hidden-checkbox" id="resources-subnav-hidden-checkbox" role="button" type="checkbox" aria-controls="collapsingResourcesSubNavbar">
<input class="subnav-hidden-checkbox" id="resources-subnav-hidden-checkbox" role="button" type="checkbox" aria-controls="collapsingResourcesSubNavbar" aria-labelledby="resources-subnav-hidden-checkbox-label">
<div class="bar">
<div class="navbar-toggler navbar-toggler-left nhsuk-u-font-size-19">@GetActiveTabName()</div>
<label class="navbar-toggler navbar-toggler-right" for="resources-subnav-hidden-checkbox">
<label class="navbar-toggler navbar-toggler-right" id="resources-subnav-hidden-checkbox-label" for="resources-subnav-hidden-checkbox">
<i class="fa-solid fa-chevron-down"><span class="nhsuk-u-visually-hidden">Show Resource Options</span></i>
<i class="fa-solid fa-chevron-up display--hide"><span class="nhsuk-u-visually-hidden">Hide Resource Options</span></i>

Expand Down
6 changes: 3 additions & 3 deletions LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
@await Component.InvokeAsync("NavigationItems", new { navView = "MobileTopRightNav", controllerName = controllerName })
@if (User.Identity.IsAuthenticated) {
<div class="nhsuk-header__menu">
<label for="header-dropdown-menu-control" class="nhsuk-header__menu-toggle" id="toggle-menu" aria-controls="header-navigation" aria-expanded="false">Menu</label>
<label class="nhsuk-header__menu-toggle" id="toggle-menu" aria-controls="header-navigation" aria-expanded="false">Menu</label>
@await Component.InvokeAsync("NavigationItems", new { navView = "MenuNotificationDot" })
</div>
}
Expand All @@ -40,7 +40,7 @@

@if (User.Identity.IsAuthenticated) {
<div class="nhsuk-header__menu nhsuk-header__not-mobile">
<label for="header-dropdown-menu-control" class="nhsuk-header__menu-toggle" id="toggle-menu" aria-controls="header-navigation" aria-expanded="false">Menu</label>
<label class="nhsuk-header__menu-toggle" id="toggle-menu" aria-controls="header-navigation" aria-expanded="false">Menu</label>
@await Component.InvokeAsync("NavigationItems", new { navView = "MenuNotificationDot" })
</div>
}
Expand All @@ -51,7 +51,7 @@
<input type="checkbox" id="header-dropdown-menu-control" aria-labelledby="close-menu toggle-menu">
<nav class="nhsuk-header__navigation app-width-container" id="header-navigation" role="navigation" aria-label="Primary navigation" aria-labelledby="label-navigation">
<p class="nhsuk-header__navigation-title"><span id="label-navigation">Menu</span>
<label for="header-dropdown-menu-control" class="nhsuk-header__navigation-close" id="close-menu">
<label class="nhsuk-header__navigation-close" id="close-menu">
<svg class="nhsuk-icon nhsuk-icon__close" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false" width="27" height="27">
<path d="M13.41 12l5.3-5.29a1 1 0 1 0-1.42-1.42L12 10.59l-5.29-5.3a1 1 0 0 0-1.42 1.42l5.3 5.29-5.3 5.29a1 1 0 0 0 0 1.42 1 1 0 0 0 1.42 0l5.29-5.3 5.29 5.3a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42z"></path>
</svg>
Expand Down