maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: change aria-page to aria-current (#13558)

Browse source
This commit is contained in:
Ridhwana 2021-04-28 21:33:29 +02:00 • committed by GitHub
parent 3a4da2dd5a
commit b027a0c342
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/javascript/admin/__tests__/controllers/sidebar_controller.test.js
View file

@ -13,7 +13,7 @@ describe('SidebarController', () => {
<nav class="hidden m:block">
<ul>
<li>
<a class="crayons-link crayons-link--block " href="/admin/permissions" aria-page="" data-action="click->sidebar#expandDropdown">
<a class="crayons-link crayons-link--block " href="/admin/permissions" data-action="click->sidebar#expandDropdown">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" class="dropdown-icon crayons-icon" role="img"><path d="M4 22a8 8 0 1 1 16 0h-2a6 6 0 1 0-12 0H4zm8-9c-3.315 0-6-2.685-6-6s2.685-6 6-6 6 2.685 6 6-2.685 6-6 6zm0-2c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4z"></path></svg>
Admin Team
</a>
@ -25,22 +25,22 @@ describe('SidebarController', () => {
</button>
<ul id="advanced" data-sidebar-target="submenu" class="collapse hide">
<li>
<a class="crayons-link crayons-link--block ml-7 " href="/admin/advanced/broadcasts" aria-page="">
<a class="crayons-link crayons-link--block ml-7 " href="/admin/advanced/broadcasts">
Broadcasts
</a>
</li>
<li>
<a class="crayons-link crayons-link--block ml-7 " href="/admin/advanced/response_templates" aria-page="">
<a class="crayons-link crayons-link--block ml-7 " href="/admin/advanced/response_templates">
Response Templates
</a>
</li>
<li>
<a class="crayons-link crayons-link--block ml-7 " href="/admin/advanced/sponsorships" aria-page="">
<a class="crayons-link crayons-link--block ml-7 " href="/admin/advanced/sponsorships">
Sponsorships
</a>
</li>
<li>
<a class="crayons-link crayons-link--block ml-7 " href="/admin/advanced/tools" aria-page="">
<a class="crayons-link crayons-link--block ml-7 " href="/admin/advanced/tools">
Developer Tools
</a>
</li>
@ -54,22 +54,22 @@ describe('SidebarController', () => {
</button>
<ul id="apps" data-sidebar-target="submenu" class="expand show">
<li>
<a class="crayons-link crayons-link--block ml-7 fw-bold" href="/admin/apps/chat_channels" aria-page="page">
<a class="crayons-link crayons-link--block ml-7 fw-bold" href="/admin/apps/chat_channels">
Chat Channels
</a>
</li>
<li>
<a class="crayons-link crayons-link--block ml-7 " href="/admin/apps/events" aria-page="">
<a class="crayons-link crayons-link--block ml-7 " href="/admin/apps/events">
Events
</a>
</li>
<li>
<a class="crayons-link crayons-link--block ml-7 " href="/admin/apps/listings" aria-page="">
<a class="crayons-link crayons-link--block ml-7 " href="/admin/apps/listings">
Listings
</a>
</li>
<li>
<a class="crayons-link crayons-link--block ml-7 " href="/admin/apps/welcome" aria-page="">
<a class="crayons-link crayons-link--block ml-7 " href="/admin/apps/welcome">
Welcome
</a>
</li>

4
app/views/admin/shared/_nested_sidebar.html.erb
View file

@ -4,7 +4,7 @@
<% if group[:children][0][:visible] %>
<a class="crayons-link crayons-link--block <%= "crayons-link--current" if deduced_scope(request) == group[:children][0][:controller] %>"
href="/admin/<%= group[:children][0][:controller] %>"
aria-page="<%= "page" if deduced_controller(request) == group[:children][0][:controller] %>"
aria-current="<%= "page" if deduced_controller(request) == group[:children][0][:controller] %>"
data-action="click->sidebar#expandDropdown">
<%= inline_svg_tag(group[:svg], aria_hidden: true, class: "dropdown-icon crayons-icon") %>
<%= display_name(group_name) %>
@ -30,7 +30,7 @@
<li>
<a class="crayons-link crayons-link--block ml-7 <%= "fw-bold" if deduced_controller(request) == item[:controller].to_s %>"
href="/admin/<%= group_name %>/<%= item[:controller] %>"
aria-page="<%= "page" if deduced_controller(request) == item[:controller].to_s %>">
aria-current="<%= "page" if deduced_controller(request) == item[:controller].to_s %>">
<%= item[:name].to_s.titleize %>
</a>
</li>

2
app/views/layouts/admin.html.erb
View file

@ -56,7 +56,7 @@
<% if FeatureFlag.enabled?(:admin_restructure) %>
<ul>
<li>
<a class="crayons-link crayons-link--block <%= "crayons-link--current" if controller.controller_name == "overview" %>" href="<%= admin_path %>" aria-page="<%= "page" if controller.controller_name == "overview" %>">
<a class="crayons-link crayons-link--block <%= "crayons-link--current" if controller.controller_name == "overview" %>" href="<%= admin_path %>" aria-current"<%= "page" if controller.controller_name == "overview" %>">
<%= inline_svg_tag("stack-line.svg", aria: true, class: "dropdown-icon crayons-icon") %>
Overview
</a>