Skip to content

Commit 3cec4c0

Browse files
ottenhoffottenhoff
authored
SAK-38394 cleanup use of role=menu and menuitem to improve aXe a11y score (sakaiproject#10016)
1 parent 7548ecb commit 3cec4c0

File tree

4 files changed

+16
-15
lines changed

4 files changed

+16
-15
lines changed

‎.github/workflows/server.yml

+1
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ jobs:
7979
env:
8080
CYPRESS_RECORD_KEY: f2049235-3f10-4142-a26c-fc017211a776
8181
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
82+
COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }}
8283
- name: Check number of MySQL statements
8384
if: ${{ always() }}
8485
run: |

‎portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeLoginNav.vm

+8-8
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<div class="tab-box">
4242
#foreach($quickLink in $quickLinks)
4343
<li class="Mrphs-quickLinksNav__submenuitem">
44-
<a role="menuitem" href="${quickLink.url}" title="$quickLink.title" target="_blank">
44+
<a href="${quickLink.url}" title="$quickLink.title" target="_blank">
4545
#if(${quickLink.iconType} == "image")
4646
<span id="quicklink-icon" style="background-image:url(${quickLink.imageURI})"></span>
4747
#elseif (${quickLink.iconType} == "icon")
@@ -104,19 +104,19 @@
104104

105105
#end ## END of IF (${displayUserloginInfo})
106106

107-
<ul class="Mrphs-userNav__subnav is-hidden" role="menu">
107+
<ul class="Mrphs-userNav__subnav is-hidden">
108108

109109
<li class="Mrphs-userNav__submenuitem Mrphs-userData">
110110
<div class="Mrphs-userNav__submenuitem--profile-and-image">
111111
#if (${tabsSites.mrphs_profileToolUrl})
112112
<div class="has-avatar">
113-
<a role="menuitem" class="Mrphs-userNav__submenuitem--profilelink" href="${tabsSites.mrphs_profileToolUrl}" aria-haspopup="dialog">
113+
<a class="Mrphs-userNav__submenuitem--profilelink" href="${tabsSites.mrphs_profileToolUrl}" aria-haspopup="dialog">
114114
<span class="Mrphs-userNav__submenuitem--profilepicture Mrphs-userNav__pic-changer" style="background-image:url(/direct/profile/${loginUserId}/image/thumb)"></span>
115115
<span class="sr-only">${rloader.pic_changer_title}</span>
116116
</a>
117117
</div>
118118
<div class="Mrphs-userNav__submenuitem--profile">
119-
<a role="menuitem" href="${tabsSites.mrphs_profileToolUrl}">
119+
<a href="${tabsSites.mrphs_profileToolUrl}">
120120
<span>${rloader.sit_profile}</span>
121121
</a>
122122
</div>
@@ -133,15 +133,15 @@
133133
</li>
134134

135135
<li class="Mrphs-userNav__submenuitem Mrphs-userNav__submenuitem-indented">
136-
<a role="menuitem" href="javascript:;" id="Mrphs-userNav__submenuitem--connections" aria-haspopup="dialog">
136+
<a href="javascript:;" id="Mrphs-userNav__submenuitem--connections" aria-haspopup="dialog">
137137
<span>${rloader.sit_connections}</span>
138138
</a>
139139
</li>
140140

141141
#if (${tabsSites.calendarToolUrl})
142142

143143
<li class="Mrphs-userNav__submenuitem Mrphs-userNav__submenuitem-indented">
144-
<a role="menuitem" href="${tabsSites.calendarToolUrl}" class="Mrphs-userNav__submenuitem--calendar">
144+
<a href="${tabsSites.calendarToolUrl}" class="Mrphs-userNav__submenuitem--calendar">
145145
<span>${rloader.sit_calendar}</span>
146146
</a>
147147
</li>
@@ -151,7 +151,7 @@
151151
#if (${tabsSites.prefsToolUrl})
152152

153153
<li class="Mrphs-userNav__submenuitem Mrphs-userNav__submenuitem-indented">
154-
<a role="menuitem" href="${tabsSites.prefsToolUrl}" class="Mrphs-userNav__submenuitem--prefs">
154+
<a href="${tabsSites.prefsToolUrl}" class="Mrphs-userNav__submenuitem--prefs">
155155
<span>${rloader.sit_preferences}</span>
156156
</a>
157157
</li>
@@ -161,7 +161,7 @@
161161
#if (${tabsSites.tutorial})
162162

163163
<li class="Mrphs-userNav__submenuitem Mrphs-userNav__submenuitem-indented">
164-
<a id="tutorialLink" role="menuitem" href="#" onclick="startTutorial({});" class="Mrphs-userNav__submenuitem--tutorial" aria-haspopup="dialog">
164+
<a id="tutorialLink" href="#" onclick="startTutorial({});" class="Mrphs-userNav__submenuitem--tutorial" aria-haspopup="dialog">
165165
<span>${rloader.sit_tutorial}</span>
166166
</a>
167167
</li>

‎portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/moresites.vm

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,27 @@
1010

1111
<div class="hidden" id="max-favorite-entries">${tabsSites.maxFavoritesShown}</div>
1212

13-
<ul id="otherSitesMenu" role="menu">
13+
<ul id="otherSitesMenu" role="menubar">
1414
#if (${tabsSites.worksiteToolUrl})
1515

16-
<li><a role="menuitem" id="allSites" href="${tabsSites.mrphs_worksiteToolUrl}"><span>${rloader.sit_allsites}</span></a></li>
16+
<li role="menuitem"><a id="allSites" href="${tabsSites.mrphs_worksiteToolUrl}"><span>${rloader.sit_allsites}</span></a></li>
1717

1818
#if ($allowAddSite)
1919

20-
<li><a role="menuitem" id="newSite" href="${tabsSites.mrphs_worksiteToolUrl}?panel=Shortcut&amp;sakai_action=doNew_site&amp"><span>${rloader.sit_newsite}</span></a></li>
20+
<li role="menuitem"><a id="newSite" href="${tabsSites.mrphs_worksiteToolUrl}?panel=Shortcut&amp;sakai_action=doNew_site&amp"><span>${rloader.sit_newsite}</span></a></li>
2121

2222
#end ## END of IF ($allowAddSite)
2323

2424
#end ## END of IF (${tabsSites.worksiteToolUrl})
2525

2626
#if (${tabsSites.prefsToolUrl})
2727

28-
<li><a role="menuitem" href="${tabsSites.prefsToolUrl}"><span>${rloader.sit_preferences}</span></a></li>
28+
<li role="menuitem"><a href="${tabsSites.prefsToolUrl}"><span>${rloader.sit_preferences}</span></a></li>
2929

3030
#end ## END of IF (${tabsSites.prefsToolUrl})
3131

32-
<li class="otherSitesMenuClose">
33-
<a role="menuitem" href="javascript:void(0);">
32+
<li class="otherSitesMenuClose" role="menuitem">
33+
<a href="javascript:void(0);">
3434
<span class="sr-only">${rloader.sit_othersitesclose}</span>
3535
<span class="fa fa-times" aria-hidden="true"></span>
3636
</a>

‎user/user-tool-prefs/tool/src/java/org/sakaiproject/user/jsf/HideDivisionRenderer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void encodeBegin(FacesContext context, UIComponent component)
8787

8888
writer.write("<fieldset>");
8989
writer.write("<legend>");
90-
writer.write("<a role='button' data-toggle='collapse' aria-expanded='true' aria-target='" + id + "' href='#" + id + "' data-target=\"[id='" + id + "']\">" + title + "</a>");
90+
writer.write("<a role='button' data-toggle='collapse' aria-expanded='true' href='#" + id + "' data-target=\"[id='" + id + "']\">" + title + "</a>");
9191
writer.write("</legend>");
9292

9393
writer.write("<div class='collapse in' " +

0 commit comments

Comments
 (0)