SAK-32595 role=menuitem must be contained within a role=menu (sakaipr…

…oject#4479)
thakursir · Jun 10, 2017 · 5ae9635 · 5ae9635
1 parent 8730f31
commit 5ae9635
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeLoginNav.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeLoginNav.vm
@@ -23,8 +23,8 @@
 
         #if ($quickLinks)
             <ul id="quickLinks" class="Mrphs-quickLinksNav">
-                <li class="Mrphs-quickLinksNav__popup" aria-haspopup="true">
-                    <a href="javascript:void(0);" class="js-toggle-quick-links-nav" title="${rloader.sit_quick_links_title}" role="menuitem"  aria-haspopup="true">
+                <li class="Mrphs-quickLinksNav__popup">
+                    <a href="javascript:void(0);" class="js-toggle-quick-links-nav" title="${rloader.sit_quick_links_title}" aria-haspopup="true">
                         <i class="fa fa-th fa-external-link-square" aria-hidden="true"></i><span class="quicklinks-label">${rloader.sit_quick_links}</span>
                     </a>
                 </li>
@@ -56,7 +56,7 @@
 
         #if (${userIsLoggedIn})
             <div class="Mrphs-sitesNav__menuitem view-all-sites-btn">
-                <a href="javascript:void(0);" title="${rloader.sit_allsites}" role="menuitem" aria-haspopup="true">
+                <a href="javascript:void(0);" title="${rloader.sit_allsites}" aria-haspopup="true">
                     <i class="fa fa-th all-sites-icon" aria-hidden="true"></i> <span class="all-sites-label">${rloader.sit_worksites}</span>
                 </a>
             </div>
@@ -68,20 +68,20 @@
 
                     #if (${site.isMyWorkspace})
 
-                        <li class="Mrphs-userNav__popup js-toggle-user-nav" aria-haspopup="true">
+                        <li class="Mrphs-userNav__popup js-toggle-user-nav">
 
                                 #if (${displayUserloginInfo})
 
                                     #if (${tabsSites.mrphs_profileToolUrl})
 
-                                        <div id="loginUser" role="menuitem" class="has-avatar Mrphs-userNav__submenuitem--userlink #if (${site.isCurrentSite}) current-site #end">
+                                        <div id="loginUser" class="has-avatar Mrphs-userNav__submenuitem--userlink #if (${site.isCurrentSite}) current-site #end">
                                             <a href="javascript:void(0);" class="Mrphs-userNav__drop-btn Mrphs-userNav__submenuitem--profilepicture" style="background-image:url(/direct/profile/${loginUserId}/image/thumb)" tabindex="-1"></a>
-                                            <a href="javascript:void(0);" class="Mrphs-userNav__drop-btn Mrphs-userNav__submenuitem--username">${loginUserFirstName}</a>
+                                            <a href="javascript:void(0);" class="Mrphs-userNav__drop-btn Mrphs-userNav__submenuitem--username" aria-haspopup="true">${loginUserFirstName}</a>
                                         </div>
 
                                     #else
 
-                                        <a id="loginUser" role="menuitem" href="javascript:void(0);" class="Mrphs-userNav__drop-btn no-avatar Mrphs-userNav__submenuitem--userlink #if (${site.isCurrentSite}) current-site #end">
+                                        <a id="loginUser" href="javascript:void(0);" class="Mrphs-userNav__drop-btn no-avatar Mrphs-userNav__submenuitem--userlink #if (${site.isCurrentSite}) current-site #end">
                                             <span class="Mrphs-userNav__submenuitem--username">${loginUserFirstName}</span>
                                             <span class="Mrphs-userNav__submenuitem--userid">${loginUserDispId}</span>
                                         </a>
@@ -96,7 +96,7 @@
                                     <div class="Mrphs-userNav__submenuitem--profile-and-image">
                                         #if (${tabsSites.mrphs_profileToolUrl})
                                             <div class="has-avatar">
-                                                <a class="Mrphs-userNav__submenuitem--profilelink" href="${tabsSites.mrphs_profileToolUrl}">
+                                                <a role="menuitem" class="Mrphs-userNav__submenuitem--profilelink" href="${tabsSites.mrphs_profileToolUrl}">
                                                     <span class="Mrphs-userNav__submenuitem--profilepicture Mrphs-userNav__pic-changer" style="background-image:url(/direct/profile/${loginUserId}/image/thumb)" tabindex="-1"></span>
                                                 </a>
                                             </div>

diff --git a/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/moresites.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/moresites.vm
@@ -8,29 +8,29 @@
 
     <div id="selectSiteModal" class="outscreen">
 
-        <div style="display: none" id="max-favorite-entries">${tabsSites.maxFavoritesShown}</div>
+        <div class="hidden" id="max-favorite-entries">${tabsSites.maxFavoritesShown}</div>
 
-        <ul id="otherSitesMenu">
+        <ul id="otherSitesMenu" role="menu">
             #if (${tabsSites.worksiteToolUrl})
 
-                <li><a id="allSites" href="${tabsSites.mrphs_worksiteToolUrl}"><span>${rloader.sit_allsites}</span></a></li>
+                <li><a role="menuitem" id="allSites" href="${tabsSites.mrphs_worksiteToolUrl}"><span>${rloader.sit_allsites}</span></a></li>
 
                 #if ($allowAddSite)
 
-                    <li><a id="newSite" href="${tabsSites.mrphs_worksiteToolUrl}?panel=Shortcut&amp;sakai_action=doNew_site&amp"><span>${rloader.sit_newsite}</span></a></li>
+                    <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>
 
                 #end ## END of IF ($allowAddSite)
 
             #end ## END of IF (${tabsSites.worksiteToolUrl})
 
             #if (${tabsSites.prefsToolUrl})
 
-                <li><a href="${tabsSites.prefsToolUrl}"><span>${rloader.sit_preferences}</span></a></li>
+                <li><a role="menuitem" href="${tabsSites.prefsToolUrl}"><span>${rloader.sit_preferences}</span></a></li>
 
             #end ## END of IF (${tabsSites.prefsToolUrl})
 
             <li class="otherSitesMenuClose">
-                <a href="javascript:void(0);">
+                <a role="menuitem" href="javascript:void(0);">
                     <span class="sr-only">${rloader.sit_othersitesclose}</span>
                     <span class="fa fa-times" aria-hidden="true"></span>
                 </a>