Add alt text for left nav in mini-mode

Fixes openshift#2294 Replaces openshift#2309
f0x11 · Mar 26, 2018 · d340169 · d340169
1 parent 576fa1b
commit d340169
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 22 deletions.
diff --git a/app/views/_sidebar.html b/app/views/_sidebar.html
@@ -23,31 +23,20 @@
         ng-mouseenter="onMouseEnter(primaryItem)"
         ng-mouseleave="onMouseLeave(primaryItem)"
         class="list-group-item">
-        <a ng-if="primaryItem.href" ng-href="{{navURL(primaryItem.href)}}" ng-click="itemClicked(primaryItem)">
-          <span class="{{primaryItem.iconClass}}"></span> <span class="list-group-item-value">{{primaryItem.label}}</span>
+        <a
+          ng-if="primaryItem.href"
+          ng-href="{{navURL(primaryItem.href)}}"
+          ng-click="itemClicked(primaryItem)">
+          <span title="{{primaryItem.label}}" class="{{primaryItem.iconClass}}" aria-hidden="true"></span> <span class="list-group-item-value">{{primaryItem.label}}</span> <span ng-if="nav.collapsed && !isMobile" class="sr-only">{{primaryItem.label}}</span>
         </a>
         <a
           ng-if="!primaryItem.href"
           href=""
           ng-click="itemClicked(primaryItem)">
-          <span class="{{primaryItem.iconClass}}"></span> <span class="list-group-item-value">{{primaryItem.label}}</span>
-          class="hover-nav dropdown-menu hidden-xs">
-          <ul class="nav nav-sidenav-secondary">
-            <li
-              ng-repeat-start="secondarySection in primaryItem.secondaryNavSections"
-              ng-if="secondarySection.header"
-              class="dropdown-header">
-              {{secondarySection.header}}
-            </li>
-            <li
-              ng-repeat="secondaryItem in secondarySection.items"
-              ng-class="{ active: secondaryItem === activeSecondary }"
-              ng-if="show(secondaryItem)">
-              <a ng-href="{{navURL(secondaryItem.href)}}">{{secondaryItem.label|translate}}</a>
-            </li>
-            <li ng-repeat-end style="display:none;"></li>
-          </ul>
-        </div>
+          <span title="{{primaryItem.label}}" class="{{primaryItem.iconClass}}" aria-hidden="true"></span> <span class="list-group-item-value">{{primaryItem.label}}</span> <span ng-if="nav.collapsed && !isMobile" class="sr-only">{{primaryItem.label}}</span>
+        </a>
+
+        <!-- Secondary Nav -->
         <div
           ng-if="primaryItem.secondaryNavSections.length"
           class="hover-nav visible-xs-block">

diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
@@ -513,10 +513,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "          'secondary-nav-item-pf': primaryItem.secondaryNavSections.length\n" +
     "        }\" ng-if=\"show(primaryItem)\" ng-mouseenter=\"onMouseEnter(primaryItem)\" ng-mouseleave=\"onMouseLeave(primaryItem)\" class=\"list-group-item\">\n" +
     "<a ng-if=\"primaryItem.href\" ng-href=\"{{navURL(primaryItem.href)}}\" ng-click=\"itemClicked(primaryItem)\">\n" +
-    "<span class=\"{{primaryItem.iconClass}}\"></span> <span class=\"list-group-item-value\">{{primaryItem.label}}</span>\n" +
+    "<span title=\"{{primaryItem.label}}\" class=\"{{primaryItem.iconClass}}\" aria-hidden=\"true\"></span> <span class=\"list-group-item-value\">{{primaryItem.label}}</span> <span ng-if=\"nav.collapsed && !isMobile\" class=\"sr-only\">{{primaryItem.label}}</span>\n" +
     "</a>\n" +
     "<a ng-if=\"!primaryItem.href\" href=\"\" ng-click=\"itemClicked(primaryItem)\">\n" +
-    "<span class=\"{{primaryItem.iconClass}}\"></span> <span class=\"list-group-item-value\">{{primaryItem.label}}</span>\n" +
+    "<span title=\"{{primaryItem.label}}\" class=\"{{primaryItem.iconClass}}\" aria-hidden=\"true\"></span> <span class=\"list-group-item-value\">{{primaryItem.label}}</span> <span ng-if=\"nav.collapsed && !isMobile\" class=\"sr-only\">{{primaryItem.label}}</span>\n" +
     "</a>\n" +
     "\n" +
     "<div ng-if=\"primaryItem.secondaryNavSections.length\" class=\"secondary-nav-item-pf\" ng-class=\"{\n" +