Merge pull request #34856 from dimagi/ml/accessibility-fixes

Minor keyboard navigation fixes
dimagi · Jul 9, 2024 · 1a70089 · 1a70089
2 parents ffa9e24 + 893fad8
commit 1a70089
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 11 deletions.
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/menu_header.html b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/menu_header.html
@@ -17,7 +17,7 @@
     <% } %>
   </div>
   <% if (title.length > 0) { %>
-    <h1  aria-label="<%- title %>" tabindex="0" class="page-title"><%- title %></h1>
+    <h1 aria-label="<%- title %>" class="page-title"><%- title %></h1>
   <% } %>
   <% if (sidebarEnabled && description.length > 0) { %>
     <div aria-label="<%- description %>" tabindex="0" class="query-description"><%= description %></div>

diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/menu_header.html b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/menu_header.html
@@ -17,9 +17,9 @@
     <% } %>
   </div>
   <% if (title.length > 0) { %>
-    <h1 aria-label="<%- title %>" tabindex="0" class="page-title d-none d-md-block"><%- title %></h1>
+    <h1 aria-label="<%- title %>" class="page-title d-none d-md-block"><%- title %></h1>
   <% } %>
   <% if (sidebarEnabled && description.length > 0) { %>
-    <div aria-label="<%- description %>" tabindex="0" class="query-description"><%= description %></div>
+    <div aria-label="<%- description %>" class="query-description"><%= description %></div>
   <% } %>
 </div>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap3/item.html b/corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap3/item.html
@@ -13,7 +13,7 @@
       <% if (typeof hint !== "undefined" && hint !== null) { %>
       <div class="hq-help">
         <a href="#" tabindex="-1"  data-title="<%- text ? text : "" %>" data-content="<%- hint ? hint : "" %>">
-          <i class="fa fa-question-circle icon-question-sign"></i>
+          <i class="fa fa-question-circle icon-question-sign" tabindex="0"></i>
         </a>
       </div>
       <% } %>

diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap3/list.html b/corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap3/list.html
@@ -24,7 +24,7 @@ <h2 tabindex="0"><%- title %></h2>
         <%= description %>
       </div>
     <% } %>
-    <table class="table table-hover <%= grouped ? '' : 'table-striped table-bordered' %>" role="presentation">
+    <table class="table table-hover <%= grouped ? '' : 'table-striped table-bordered' %>">
       <tbody id="query-properties">
       </tbody>
     </table>

diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap5/item.html b/corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap5/item.html
@@ -13,7 +13,7 @@
       <% if (typeof hint !== "undefined" && hint !== null) { %>
       <div class="hq-help" data-bs-toggle="popover">
         <a href="#" tabindex="-1" title="<%- text ? text : "" %>" data-bs-content="<%- hint ? hint : "" %>">
-          <i class="fa fa-question-circle icon-question-sign"></i>
+          <i class="fa fa-question-circle icon-question-sign" tabindex="0"></i>
         </a>
       </div>
       <% } %>

diff --git a/...webapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/menu_header.html.diff.txt b/...webapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/menu_header.html.diff.txt
@@ -23,10 +23,11 @@
      <% } %>
    </div>
    <% if (title.length > 0) { %>
--    <h1  aria-label="<%- title %>" tabindex="0" class="page-title"><%- title %></h1>
-+    <h1 aria-label="<%- title %>" tabindex="0" class="page-title d-none d-md-block"><%- title %></h1>
+-    <h1 aria-label="<%- title %>" class="page-title"><%- title %></h1>
++    <h1 aria-label="<%- title %>" class="page-title d-none d-md-block"><%- title %></h1>
    <% } %>
    <% if (sidebarEnabled && description.length > 0) { %>
-     <div aria-label="<%- description %>" tabindex="0" class="query-description"><%= description %></div>
+-    <div aria-label="<%- description %>" tabindex="0" class="query-description"><%= description %></div>
++    <div aria-label="<%- description %>" class="query-description"><%= description %></div>
    <% } %>
 -</div>+</div>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/query/item.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/query/item.html.diff.txt
@@ -20,7 +20,7 @@
 -        <a href="#" tabindex="-1"  data-title="<%- text ? text : "" %>" data-content="<%- hint ? hint : "" %>">
 +      <div class="hq-help" data-bs-toggle="popover">
 +        <a href="#" tabindex="-1" title="<%- text ? text : "" %>" data-bs-content="<%- hint ? hint : "" %>">
-           <i class="fa fa-question-circle icon-question-sign"></i>
+           <i class="fa fa-question-circle icon-question-sign" tabindex="0"></i>
          </a>
        </div>
 @@ -20,8 +20,7 @@

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/query/list.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/query/list.html.diff.txt
@@ -20,7 +20,7 @@
          <%= description %>
        </div>
      <% } %>
--    <table class="table table-hover <%= grouped ? '' : 'table-striped table-bordered' %>" role="presentation">
+-    <table class="table table-hover <%= grouped ? '' : 'table-striped table-bordered' %>">
 +    <table class="table <%= grouped ? '' : 'table-striped table-bordered' %>" role="presentation">
        <tbody id="query-properties">
        </tbody>