From b04e0bd518c77991db38fb8515c8c00a38aa235e Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Thu, 28 Aug 2025 13:41:16 +0800
Subject: [PATCH 1/2] MDL-86479 theme_boost: Fix a11y issues on the course
 index options

* Add aria-label for the options menu button.
* Add proper menu and menuitem roles for the options menu.
---
 theme/boost/templates/courseindexdrawercontrols.mustache | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/theme/boost/templates/courseindexdrawercontrols.mustache b/theme/boost/templates/courseindexdrawercontrols.mustache
index 4ab622bb0ba..6ca67c91be5 100644
--- a/theme/boost/templates/courseindexdrawercontrols.mustache
+++ b/theme/boost/templates/courseindexdrawercontrols.mustache
@@ -25,18 +25,21 @@
 }}
 <div id="courseindexdrawercontrols" class="dropdown">
     <button class="btn btn-icon rounded-circle mx-2"
+            id="courseindexdrawercontrolsmenubutton"
             type="button"
             data-toggle="dropdown"
             aria-haspopup="true"
             aria-expanded="false"
             title="{{#str}}courseindexoptions, courseformat{{/str}}"
-    >
+            aria-label="{{#str}}courseindexoptions, courseformat{{/str}}"
+            aria-controls="courseindexdrawercontrolsmenu">
         <i class="icon fa fa-ellipsis-v fa-fw m-0" aria-hidden="true"></i>
     </button>
-    <div class="dropdown-menu dropdown-menu-right">
+    <div class="dropdown-menu dropdown-menu-right" role="menu" id="courseindexdrawercontrolsmenu" aria-labelledby="courseindexdrawercontrolsmenubutton">
         <a class="dropdown-item"
            href="#"
            data-action="expandallcourseindexsections"
+           role="menuitem"
         >
             {{#pix}} t/angles-down, core {{/pix}}
             {{#str}}expandall{{/str}}
@@ -44,6 +47,7 @@
         <a class="dropdown-item"
            href="#"
            data-action="collapseallcourseindexsections"
+           role="menuitem"
         >
             <span class="dir-rtl-hide">{{#pix}} t/angles-right, core {{/pix}}</span>
             <span class="dir-ltr-hide">{{#pix}} t/angles-left, core {{/pix}}</span>

From 72fe24b91ad6330cda1d40a5b46956fdf8683b36 Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Fri, 29 Aug 2025 21:05:22 +0800
Subject: [PATCH 2/2] MDL-86479 course: Add accessibility coverage for course
 index options

---
 course/format/tests/behat/course_courseindex.feature | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/course/format/tests/behat/course_courseindex.feature b/course/format/tests/behat/course_courseindex.feature
index 93333bfb262..c812de48c6d 100644
--- a/course/format/tests/behat/course_courseindex.feature
+++ b/course/format/tests/behat/course_courseindex.feature
@@ -187,7 +187,7 @@ Feature: Course index depending on role
     And I should see "Section 3" in the "courseindex-content" "region"
     And I should see "Activity sample 3" in the "courseindex-content" "region"
 
-  @javascript
+  @javascript @accessibility
   Scenario: Course index toggling all sections
     When I am on the "Course 1" course page logged in as teacher1
     # Sections should be opened by default.
@@ -199,6 +199,7 @@ Feature: Course index depending on role
     And I should see "Activity sample 3" in the "courseindex-content" "region"
     # Collapse all sections
     And I click on "Course index options" "button" in the "#courseindexdrawercontrols" "css_element"
+    And the page should meet accessibility standards
     And I click on "Collapse all" "link" in the "#courseindexdrawercontrols" "css_element"
     And I should see "Section 1" in the "courseindex-content" "region"
     And I should not see "Activity sample 1" in the "courseindex-content" "region"