SAK-40139 cleanup accessibility issues in profile and pic changer (sa…

…kaiproject#5698) * SAK-40139 modify profile image link and span * SAK-40139 cleanup accessibility issues in profile and pic changer
elhakimfirdaus · Jun 15, 2018 · eff265c · eff265c
1 parent e84d196
commit eff265c
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/library/src/morpheus-master/sass/modules/navigation/_base.scss b/library/src/morpheus-master/sass/modules/navigation/_base.scss
@@ -468,13 +468,16 @@ body.is-logged-out{
 		position: relative;
 
 		.#{$namespace}userNav__submenuitem--username, .#{$namespace}userNav__submenuitem--userid{
-			display: inline-block;
-			max-width: 100px;
-			overflow: hidden;
-			position: relative;
-			text-overflow: ellipsis;
 			text-decoration: none;
-			white-space: nowrap;
+
+			span.textlink {
+				display: inline-block;
+				max-width: 100px;
+				overflow: hidden;
+				position: relative;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+			}
 		}
 	}
 

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
@@ -75,8 +75,10 @@
                                     #if (${tabsSites.mrphs_profileToolUrl})
 
                                         <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" aria-haspopup="true">${loginUserFirstName}</a>
+                                            <a href="javascript:void(0);" role="button" aria-haspopup="true" class="Mrphs-userNav__drop-btn Mrphs-userNav__submenuitem--username">
+                                                <span class="Mrphs-userNav__submenuitem--profilepicture" style="background-image:url(/direct/profile/${loginUserId}/image/thumb)"></span>
+                                                <span class="textlink">${loginUserFirstName}</span>
+                                            </a>
                                         </div>
 
                                     #else
@@ -96,8 +98,9 @@
                                     <div class="Mrphs-userNav__submenuitem--profile-and-image">
                                         #if (${tabsSites.mrphs_profileToolUrl})
                                             <div class="has-avatar">
-                                                <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 role="menuitem" class="Mrphs-userNav__submenuitem--profilelink" href="${tabsSites.mrphs_profileToolUrl}" aria-haspopup="dialog">
+                                                    <span class="Mrphs-userNav__submenuitem--profilepicture Mrphs-userNav__pic-changer" style="background-image:url(/direct/profile/${loginUserId}/image/thumb)"></span>
+                                                    <span class="sr-only">${rloader.pic_changer_title}</span>
                                                 </a>
                                             </div>
                                             <div class="Mrphs-userNav__submenuitem--profile">
@@ -118,7 +121,7 @@
                                 </li>
 
                                 <li class="Mrphs-userNav__submenuitem Mrphs-userNav__submenuitem-indented">
-                                    <a role="menuitem" href="javascript:;" id="Mrphs-userNav__submenuitem--connections">
+                                    <a role="menuitem" href="javascript:;" id="Mrphs-userNav__submenuitem--connections" aria-haspopup="dialog">
                                         <span>${rloader.sit_connections}</span>
                                     </a>
                                 </li>
@@ -146,7 +149,7 @@
                                     #if (${tabsSites.tutorial})
 
                                         <li class="Mrphs-userNav__submenuitem Mrphs-userNav__submenuitem-indented">
-                                            <a id="tutorialLink" role="menuitem" href="#" onclick="startTutorial({});" class="Mrphs-userNav__submenuitem--tutorial">
+                                            <a id="tutorialLink" role="menuitem" href="#" onclick="startTutorial({});" class="Mrphs-userNav__submenuitem--tutorial" aria-haspopup="dialog">
                                                 <span>${rloader.sit_tutorial}</span>
                                             </a>
                                         </li>

diff --git a/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/site.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/site.vm
@@ -223,7 +223,7 @@
         <div class="modal fade" id="profileImageUpload" tabindex="-1" role="dialog">
             <div class="modal-dialog" role="document">
                 <div class="modal-content">
-                    <div class="modal-header"><h3>${rloader.getString("pic_changer_title")}</h3></div>
+                    <div class="modal-header"><h2>${rloader.getString("pic_changer_title")}</h2></div>
                     <div class="modal-body">
                         <div id="remove-error" class="alert alert-danger">${rloader.getString("pic_changer_remove_error")}</div>
                         <div id="upload-error" class="alert alert-danger">${rloader.getString("pic_changer_upload_error")}</div>

diff --git a/profile2/tool/src/java/org/sakaiproject/profile2/tool/pages/BasePage.html b/profile2/tool/src/java/org/sakaiproject/profile2/tool/pages/BasePage.html
@@ -99,7 +99,5 @@
 		<wicket:child />
 	</div>
 
-	<div id="footer"></div>
-
 </body>
 </html>
diff --git a/profile2/tool/src/webapp/css/profile2.css b/profile2/tool/src/webapp/css/profile2.css
@@ -27,10 +27,6 @@
 #rightPanel {
 }
 
-div#footer {
-}
-
-
 #fullWidth {
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -99,7 +99,5 @@ @@
     		<wicket:child />
     	</div>
-    	<div id="footer"></div>
     </body>
     </html>