From 654ec3f7822d5a8516c97a3f68670f5f7ac07de5 Mon Sep 17 00:00:00 2001
From: Jeff Bishop <jeffbis@arizona.edu>
Date: Mon, 20 Apr 2026 09:26:33 -0700
Subject: [PATCH 1/6] Fix #5511: Give split-toggle buttons distinct accessible
 names

Both split-toggle buttons previously used {{ item.title }} as their
visually-hidden text, making them indistinguishable from the adjacent
link for screen reader users (WCAG 4.1.2 Name, Role, Value).

- Append ', expand submenu' (translatable) to the visually-hidden text
  on both the level-0 and level-1 split-toggle buttons so they
  announce distinctly from the adjacent link (e.g. "People, expand
  submenu, button" vs "People, link").
- Remove data-bs-auto-close="outside" from the level-1 collapse
  trigger button; that attribute is a Bootstrap Dropdown option only
  and has no effect on a data-bs-toggle="collapse" element.
---
 .../templates/navigation/menu--main-navbar-az.html.twig     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/themes/custom/az_barrio/templates/navigation/menu--main-navbar-az.html.twig b/themes/custom/az_barrio/templates/navigation/menu--main-navbar-az.html.twig
index 34b681899d..a11e7527e1 100644
--- a/themes/custom/az_barrio/templates/navigation/menu--main-navbar-az.html.twig
+++ b/themes/custom/az_barrio/templates/navigation/menu--main-navbar-az.html.twig
@@ -60,7 +60,7 @@
           {% if item.below %}
             {% if not is_placeholder %}
               <button type="button" class="btn dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-expanded="false">
-                <span class="visually-hidden">{{ item.title }}</span>
+                <span class="visually-hidden">{{ item.title }}, {{ 'expand submenu'|t }}</span>
               </button>
             {% endif %}
             {{ menus.menu_links(item.below, attributes.removeClass('nav-item'), menu_level + 1, item) }}
@@ -69,8 +69,8 @@
           {% if item.below %}
             <div class="btn-group">
               {{ link(item.title, item.url, { 'class': 'dropdown-item' }) }}
-              <button type="button" class="btn dropdown-toggle dropdown-toggle-split" data-bs-toggle="collapse" data-bs-target="#tertiary-{{ item.title|clean_class }}" data-bs-auto-close="outside" aria-controls="tertiary-{{ item.title|clean_class }}" aria-expanded="{{ item.in_active_trail ? 'true' : 'false' }}">
-                <span class="visually-hidden">{{ item.title }}</span>
+              <button type="button" class="btn dropdown-toggle dropdown-toggle-split" data-bs-toggle="collapse" data-bs-target="#tertiary-{{ item.title|clean_class }}" aria-controls="tertiary-{{ item.title|clean_class }}" aria-expanded="{{ item.in_active_trail ? 'true' : 'false' }}">
+                <span class="visually-hidden">{{ item.title }}, {{ 'expand submenu'|t }}</span>
               </button>
             </div>
             {{ menus.menu_links(item.below, attributes, menu_level + 1, item) }}

From cc4c21f501cc91bb6e084b85758fe0aa0de8502f Mon Sep 17 00:00:00 2001
From: Jeff Bishop <jeffbis@arizona.edu>
Date: Mon, 20 Apr 2026 10:43:47 -0700
Subject: [PATCH 2/6] fix(a11y): fix WCAG 4.1.2 split-toggle accessible names
 in AZ Navbar

Both the level-0 and level-1 split-toggle buttons were using
{{ item.title }} as their visually-hidden text, making them
indistinguishable from the adjacent link for screen reader users
(e.g. both announced as "People, link" and "People, button").

Changes:
- Add ', expand submenu' suffix (translatable) to the visually-hidden
  span on both split-toggle buttons so they announce distinctly from
  their sibling links (e.g. "People, expand submenu, button").
- Remove the ineffective data-bs-auto-close="outside" attribute from
  the level-1 collapse button; that option only applies to
  data-bs-toggle="dropdown", not data-bs-toggle="collapse".

Fixes #5511
---
 .../templates/navigation/menu--main-navbar-az.html.twig  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/themes/custom/az_barrio/templates/navigation/menu--main-navbar-az.html.twig b/themes/custom/az_barrio/templates/navigation/menu--main-navbar-az.html.twig
index 34b681899d..2370d201f1 100644
--- a/themes/custom/az_barrio/templates/navigation/menu--main-navbar-az.html.twig
+++ b/themes/custom/az_barrio/templates/navigation/menu--main-navbar-az.html.twig
@@ -1,7 +1,8 @@
 {#
 /**
  * @file
- * Arizona Barrio override to display a menu. Used when az_navbar theme setting is enabled.
+ * Arizona Barrio override to display a menu. Used when
+ * az_navbar theme setting is enabled.
  *
  * Available variables:
  * - menu_name: The machine name of the menu.
@@ -60,7 +61,7 @@
           {% if item.below %}
             {% if not is_placeholder %}
               <button type="button" class="btn dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-expanded="false">
-                <span class="visually-hidden">{{ item.title }}</span>
+                <span class="visually-hidden">{{ item.title }}, {{ 'expand submenu'|t }}</span>
               </button>
             {% endif %}
             {{ menus.menu_links(item.below, attributes.removeClass('nav-item'), menu_level + 1, item) }}
@@ -69,8 +70,8 @@
           {% if item.below %}
             <div class="btn-group">
               {{ link(item.title, item.url, { 'class': 'dropdown-item' }) }}
-              <button type="button" class="btn dropdown-toggle dropdown-toggle-split" data-bs-toggle="collapse" data-bs-target="#tertiary-{{ item.title|clean_class }}" data-bs-auto-close="outside" aria-controls="tertiary-{{ item.title|clean_class }}" aria-expanded="{{ item.in_active_trail ? 'true' : 'false' }}">
-                <span class="visually-hidden">{{ item.title }}</span>
+              <button type="button" class="btn dropdown-toggle dropdown-toggle-split" data-bs-toggle="collapse" data-bs-target="#tertiary-{{ item.title|clean_class }}" aria-controls="tertiary-{{ item.title|clean_class }}" aria-expanded="{{ item.in_active_trail ? 'true' : 'false' }}">
+                <span class="visually-hidden">{{ item.title }}, {{ 'expand submenu'|t }}</span>
               </button>
             </div>
             {{ menus.menu_links(item.below, attributes, menu_level + 1, item) }}

From 914c30983d626812a24973747ab91004dd9a9d58 Mon Sep 17 00:00:00 2001
From: Bishop <jeffbis@arizona.edu>
Date: Mon, 20 Apr 2026 11:17:15 -0700
Subject: [PATCH 3/6] fix(a11y): address Copilot review - i18n-safe labels and
 state-aware toggle text

- Use single translatable string with @title placeholder instead of
  concatenating item.title with separately-translated suffix (i18n)
- Make level 1 collapse toggle label state-aware: 'Collapse submenu'
  when expanded, 'Expand submenu' when collapsed (WCAG 4.1.2)
- Level 0 dropdown toggle keeps 'Expand' since aria-expanded starts
  false and Bootstrap JS manages runtime state

Resolves Copilot review comments on PR #5517
---
 .../templates/navigation/menu--main-navbar-az.html.twig       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/custom/az_barrio/templates/navigation/menu--main-navbar-az.html.twig b/themes/custom/az_barrio/templates/navigation/menu--main-navbar-az.html.twig
index 2370d201f1..e94e99795f 100644
--- a/themes/custom/az_barrio/templates/navigation/menu--main-navbar-az.html.twig
+++ b/themes/custom/az_barrio/templates/navigation/menu--main-navbar-az.html.twig
@@ -61,7 +61,7 @@
           {% if item.below %}
             {% if not is_placeholder %}
               <button type="button" class="btn dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-expanded="false">
-                <span class="visually-hidden">{{ item.title }}, {{ 'expand submenu'|t }}</span>
+                <span class="visually-hidden">{{ 'Expand submenu for @title'|t({'@title': item.title}) }}</span>
               </button>
             {% endif %}
             {{ menus.menu_links(item.below, attributes.removeClass('nav-item'), menu_level + 1, item) }}
@@ -71,7 +71,7 @@
             <div class="btn-group">
               {{ link(item.title, item.url, { 'class': 'dropdown-item' }) }}
               <button type="button" class="btn dropdown-toggle dropdown-toggle-split" data-bs-toggle="collapse" data-bs-target="#tertiary-{{ item.title|clean_class }}" aria-controls="tertiary-{{ item.title|clean_class }}" aria-expanded="{{ item.in_active_trail ? 'true' : 'false' }}">
-                <span class="visually-hidden">{{ item.title }}, {{ 'expand submenu'|t }}</span>
+                <span class="visually-hidden">{{ item.in_active_trail ? 'Collapse submenu for @title'|t({'@title': item.title}) : 'Expand submenu for @title'|t({'@title': item.title}) }}</span>
               </button>
             </div>
             {{ menus.menu_links(item.below, attributes, menu_level + 1, item) }}

From 76510e1ec16b82f832cf004418797b541077f81a Mon Sep 17 00:00:00 2001
From: Bishop <jeffbis@arizona.edu>
Date: Wed, 22 Apr 2026 10:27:09 -0700
Subject: [PATCH 4/6] chore(a11y): remove Expand/Collapse verbs from
 visually-hidden submenu labels

---
 .../templates/navigation/menu--main-navbar-az.html.twig      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/themes/custom/az_barrio/templates/navigation/menu--main-navbar-az.html.twig b/themes/custom/az_barrio/templates/navigation/menu--main-navbar-az.html.twig
index e94e99795f..1bb21db815 100644
--- a/themes/custom/az_barrio/templates/navigation/menu--main-navbar-az.html.twig
+++ b/themes/custom/az_barrio/templates/navigation/menu--main-navbar-az.html.twig
@@ -61,7 +61,7 @@
           {% if item.below %}
             {% if not is_placeholder %}
               <button type="button" class="btn dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-expanded="false">
-                <span class="visually-hidden">{{ 'Expand submenu for @title'|t({'@title': item.title}) }}</span>
+                <span class="visually-hidden">{{ 'Submenu for @title'|t({'@title': item.title}) }}</span>
               </button>
             {% endif %}
             {{ menus.menu_links(item.below, attributes.removeClass('nav-item'), menu_level + 1, item) }}
@@ -71,7 +71,7 @@
             <div class="btn-group">
               {{ link(item.title, item.url, { 'class': 'dropdown-item' }) }}
               <button type="button" class="btn dropdown-toggle dropdown-toggle-split" data-bs-toggle="collapse" data-bs-target="#tertiary-{{ item.title|clean_class }}" aria-controls="tertiary-{{ item.title|clean_class }}" aria-expanded="{{ item.in_active_trail ? 'true' : 'false' }}">
-                <span class="visually-hidden">{{ item.in_active_trail ? 'Collapse submenu for @title'|t({'@title': item.title}) : 'Expand submenu for @title'|t({'@title': item.title}) }}</span>
+                <span class="visually-hidden">{{ item.in_active_trail ? 'Submenu for @title'|t({'@title': item.title}) : 'Submenu for @title'|t({'@title': item.title}) }}</span>
               </button>
             </div>
             {{ menus.menu_links(item.below, attributes, menu_level + 1, item) }}
@@ -89,3 +89,4 @@
     </ul>
   {% endif %}
 {% endmacro %}
+

From ff1f62fc59a8322513d2e844930d10e33221b495 Mon Sep 17 00:00:00 2001
From: Bishop <jeffbis@arizona.edu>
Date: Wed, 22 Apr 2026 12:19:30 -0700
Subject: [PATCH 5/6] Revert "chore(a11y): remove Expand/Collapse verbs from
 visually-hidden submenu labels"

This reverts commit 76510e1ec16b82f832cf004418797b541077f81a.
---
 .../templates/navigation/menu--main-navbar-az.html.twig      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/themes/custom/az_barrio/templates/navigation/menu--main-navbar-az.html.twig b/themes/custom/az_barrio/templates/navigation/menu--main-navbar-az.html.twig
index 1bb21db815..e94e99795f 100644
--- a/themes/custom/az_barrio/templates/navigation/menu--main-navbar-az.html.twig
+++ b/themes/custom/az_barrio/templates/navigation/menu--main-navbar-az.html.twig
@@ -61,7 +61,7 @@
           {% if item.below %}
             {% if not is_placeholder %}
               <button type="button" class="btn dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-expanded="false">
-                <span class="visually-hidden">{{ 'Submenu for @title'|t({'@title': item.title}) }}</span>
+                <span class="visually-hidden">{{ 'Expand submenu for @title'|t({'@title': item.title}) }}</span>
               </button>
             {% endif %}
             {{ menus.menu_links(item.below, attributes.removeClass('nav-item'), menu_level + 1, item) }}
@@ -71,7 +71,7 @@
             <div class="btn-group">
               {{ link(item.title, item.url, { 'class': 'dropdown-item' }) }}
               <button type="button" class="btn dropdown-toggle dropdown-toggle-split" data-bs-toggle="collapse" data-bs-target="#tertiary-{{ item.title|clean_class }}" aria-controls="tertiary-{{ item.title|clean_class }}" aria-expanded="{{ item.in_active_trail ? 'true' : 'false' }}">
-                <span class="visually-hidden">{{ item.in_active_trail ? 'Submenu for @title'|t({'@title': item.title}) : 'Submenu for @title'|t({'@title': item.title}) }}</span>
+                <span class="visually-hidden">{{ item.in_active_trail ? 'Collapse submenu for @title'|t({'@title': item.title}) : 'Expand submenu for @title'|t({'@title': item.title}) }}</span>
               </button>
             </div>
             {{ menus.menu_links(item.below, attributes, menu_level + 1, item) }}
@@ -89,4 +89,3 @@
     </ul>
   {% endif %}
 {% endmacro %}
-

From 8d514910723be630d46613fb395dc21a7e437f91 Mon Sep 17 00:00:00 2001
From: Bishop <jeffbis@arizona.edu>
Date: Thu, 23 Apr 2026 12:32:35 -0700
Subject: [PATCH 6/6] Fix(5512): ensure tertiary menu structure avoids nested
 <li>; i18n submenu accessible name

---
 .../navigation/menu--main-navbar-az.html.twig        | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/themes/custom/az_barrio/templates/navigation/menu--main-navbar-az.html.twig b/themes/custom/az_barrio/templates/navigation/menu--main-navbar-az.html.twig
index 1e97ed6aef..5b1fb1cf9b 100644
--- a/themes/custom/az_barrio/templates/navigation/menu--main-navbar-az.html.twig
+++ b/themes/custom/az_barrio/templates/navigation/menu--main-navbar-az.html.twig
@@ -61,11 +61,7 @@
           {% if item.below %}
             {% if not is_placeholder %}
               <button type="button" class="btn dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-expanded="false">
-<<<<<<< HEAD
-                <span class="visually-hidden">{{ 'Expand submenu for @title'|t({'@title': item.title}) }}</span>
-=======
-                <span class="visually-hidden">{{ item.title }}, {{ 'expand submenu'|t }}</span>
->>>>>>> bug/5511
+                <span class="visually-hidden">{{ 'Submenu for @title'|t({'@title': item.title}) }}</span>
               </button>
             {% endif %}
             {{ menus.menu_links(item.below, attributes.removeClass('nav-item'), menu_level + 1, item) }}
@@ -75,11 +71,7 @@
             <div class="btn-group">
               {{ link(item.title, item.url, { 'class': 'dropdown-item' }) }}
               <button type="button" class="btn dropdown-toggle dropdown-toggle-split" data-bs-toggle="collapse" data-bs-target="#tertiary-{{ item.title|clean_class }}" aria-controls="tertiary-{{ item.title|clean_class }}" aria-expanded="{{ item.in_active_trail ? 'true' : 'false' }}">
-<<<<<<< HEAD
-                <span class="visually-hidden">{{ item.in_active_trail ? 'Collapse submenu for @title'|t({'@title': item.title}) : 'Expand submenu for @title'|t({'@title': item.title}) }}</span>
-=======
-                <span class="visually-hidden">{{ item.title }}, {{ 'expand submenu'|t }}</span>
->>>>>>> bug/5511
+                <span class="visually-hidden">{{ 'Submenu for @title'|t({'@title': item.title}) }}</span>
               </button>
             </div>
             {{ menus.menu_links(item.below, attributes, menu_level + 1, item) }}