From bc5e19b6268797c125f9cc5d308c02199f0c7e0a Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Tue, 7 Oct 2025 17:45:16 +0800
Subject: [PATCH 1/3] MDL-86840 forum: Fix heading structure of search form

---
 mod/forum/search.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mod/forum/search.php b/mod/forum/search.php
index 321dd94bd80..4f9caa8a1b1 100644
--- a/mod/forum/search.php
+++ b/mod/forum/search.php
@@ -279,8 +279,10 @@ if (!$posts = forum_search_posts($searchterms, $course->id, $page*$perpage, $per
     if (!$PAGE->has_secondary_navigation()) {
         echo $OUTPUT->heading($strforums, 2);
     }
-    echo $OUTPUT->heading($strsearchresults, 3);
-    echo $OUTPUT->heading(get_string("noposts", "forum"), 4);
+    $PAGE->activityheader->set_title($strsearchresults);
+    $searchresultsheadinglevel = $PAGE->activityheader->get_heading_level();
+    echo $OUTPUT->heading($strsearchresults, $searchresultsheadinglevel);
+    echo $OUTPUT->heading(get_string("noposts", "forum"), $searchresultsheadinglevel + 1);
 
     if (!$individualparams) {
         $words = $search;

From 3248bea893f979efc3b4ec0c99c291d197fd5f71 Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Tue, 7 Oct 2025 17:45:59 +0800
Subject: [PATCH 2/3] MDL-86840 forum: Do not use layout table for the search
 form

---
 mod/forum/templates/big_search_form.mustache | 240 +++++++++----------
 1 file changed, 111 insertions(+), 129 deletions(-)

diff --git a/mod/forum/templates/big_search_form.mustache b/mod/forum/templates/big_search_form.mustache
index 9367d019ec6..037adf6a09b 100644
--- a/mod/forum/templates/big_search_form.mustache
+++ b/mod/forum/templates/big_search_form.mustache
@@ -47,139 +47,121 @@
         "user": "Helpy McUser"
     }
 }}
-<div id="intro" class="box searchbox boxaligncenter">
+<div id="intro" class="mb-3 box searchbox boxaligncenter">
     {{#str}}searchforumintro, forum{{/str}}
 </div>
 <div class="box generalbox boxaligncenter">
     <form id="searchform" class="mform" action="{{actionurl}}" method="get">
-        <table class="searchbox table table-striped" id="form">
-            <tr>
-                <td class="c0 text-xs-right align-bottom">
-                    <label for="words">{{#str}}searchwords, forum{{/str}}</label>
-                    <input type="hidden" value="{{courseid}}" name="id">
-                </td>
-                <td class="c1">
-                    <input type="text" class="form-control" name="words" id="words" value="{{words}}">
-                </td>
-            </tr>
-            <tr>
-                <td class="c0 text-xs-right align-bottom">
-                    <label for="phrase">{{#str}}searchphrase, forum{{/str}}</label>
-                </td>
-                <td class="c1">
-                    <input type="text" class="form-control" name="phrase" id="phrase" value="{{phrase}}">
-                </td>
-            </tr>
-            <tr>
-                <td class="c0 text-xs-right align-bottom">
-                    <label for="notwords">{{#str}}searchnotwords, forum{{/str}}</label>
-                </td>
-                <td class="c1">
-                    <input type="text" class="form-control" name="notwords" id="notwords" value="{{notwords}}">
-                </td>
-            </tr>
-            {{#showfullwords}}
-                <tr>
-                    <td class="c0 text-xs-right align-bottom">
-                        <label for="fullwords">{{#str}}searchfullwords, forum{{/str}}</label>
-                    </td>
-                    <td class="c1">
-                        <input type="text" class="form-control" name="fullwords" id="fullwords" value="{{fullwords}}">
-                    </td>
-                </tr>
-            {{/showfullwords}}
-            <tr>
-                <td class="c0 text-xs-right align-bottom">
-                    <label for="timefromrestrict">{{#str}}searchdatefrom, forum{{/str}}</label>
-                </td>
-                <td class="c1 text-nowrap d-flex flex-wrap align-items-center">
-                    <div class="fdate_time_selector d-flex flex-wrap align-items-center">
-                        <input type="checkbox" id="timefromrestrict" name="timefromrestrict" value="1" {{#datefromchecked}}checked{{/datefromchecked}}>
-                        {{{datefromfields}}}
-                    </div>
-                    <input type="hidden" name="hfromday" value="0">
-                    <input type="hidden" name="hfrommonth" value="0">
-                    <input type="hidden" name="hfromyear" value="0">
-                    <input type="hidden" name="hfromhour" value="0">
-                    <input type="hidden" name="hfromminute" value="0">
-                </td>
-            </tr>
-            <tr>
-                <td class="c0 text-xs-right align-bottom">
-                    <label for="timetorestrict">{{#str}}searchdateto, forum{{/str}}</label>
-                </td>
-                <td class="c1 text-nowrap d-flex flex-wrap align-items-center">
-                    <div class="fdate_time_selector d-flex flex-wrap align-items-center">
-                        <input type="checkbox" id="timetorestrict" name="timetorestrict" value="1" {{#datetochecked}}checked{{/datetochecked}}>
-                        {{{datetofields}}}
-                    </div>
-                    <input type="hidden" name="htoday" value="0">
-                    <input type="hidden" name="htomonth" value="0">
-                    <input type="hidden" name="htoyear" value="0">
-                    <input type="hidden" name="htohour" value="0">
-                    <input type="hidden" name="htominute" value="0">
-                </td>
-            </tr>
-            <tr>
-                <td class="c0 text-xs-right align-bottom">
-                    <label for="menuforumid">{{#str}}searchwhichforums, forum{{/str}}</label>
-                </td>
-                <td class="c1">
-                    <select name="forumid" id="menuforumid" class="form-control custom-select">
-                        {{#forumoptions}}
-                            <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
-                        {{/forumoptions}}
-                    </select>
-                </td>
-            </tr>
-            <tr>
-                <td class="c0 text-xs-right align-bottom">
-                    <label for="subject">{{#str}}searchsubject, forum{{/str}}</label>
-                </td>
-                <td class="c1">
-                    <input type="text" class="form-control" name="subject" id="subject" value="{{subject}}">
-                </td>
-            </tr>
-            <tr>
-                <td class="c0 text-xs-right align-bottom">
-                    <label for="user">{{#str}}searchuser, forum{{/str}}</label>
-                </td>
-                <td class="c1">
-                    <input type="text" class="form-control" name="user" id="user" value="{{user}}">
-                </td>
-            </tr>
-            {{^guestuser}}
-            <tr>
-                <td class="c0 text-xs-right align-bottom">
-                    <label for="starredonly">{{#str}}starredonly, forum{{/str}}</label>
-                </td>
-                <td class="c1 align-middle d-flex flex-wrap align-items-center">
-                    <input type="checkbox" class="form-control" name="starredonly" id="starredonly" value="1" {{#starredonly}}checked{{/starredonly}} />
-                </td>
-            </tr>
-            {{/guestuser}}
-            {{#tagsenabled}}
-                <tr>
-                    <td class="c0">
-                        <label for="tags" class="mt-1">{{#str}}searchtags, forum{{/str}}</label>
-                    </td>
-                    <td class="c1">
-                        <select class="custom-select" name="tags[]"
-                                id="tags" multiple>
-                            {{#tagoptions}}
-                                <option value="{{value}}" {{#selected}}selected{{/selected}}>{{{text}}}</option>
-                            {{/tagoptions}}
-                        </select>
-                    </td>
-                </tr>
-            {{/tagsenabled}}
-            <tr>
-                <td> </td>
-                <td class="submit">
-                    <button type="submit" class="btn btn-primary">{{#str}}searchforums, forum{{/str}}</button>
-                </td>
-            </tr>
-        </table>
+        <div class="form-group row">
+            <label for="words" class="col-sm-4 col-form-label">{{#str}}searchwords, forum{{/str}}</label>
+            <div class="col-sm-8">
+                <input type="hidden" value="{{courseid}}" name="id">
+                <input type="text" class="form-control" name="words" id="words" value="{{words}}">
+            </div>
+        </div>
+        <div class="form-group row">
+            <label for="phrase" class="col-sm-4 col-form-label">{{#str}}searchphrase, forum{{/str}}</label>
+            <div class="col-sm-8">
+                <input type="text" class="form-control" name="phrase" id="phrase" value="{{phrase}}">
+            </div>
+        </div>
+        <div class="form-group row">
+            <label for="notwords" class="col-sm-4 col-form-label">{{#str}}searchnotwords, forum{{/str}}</label>
+            <div class="col-sm-8">
+                <input type="text" class="form-control" name="notwords" id="notwords" value="{{notwords}}">
+            </div>
+        </div>
+        {{#showfullwords}}
+        <div class="form-group row">
+            <label for="fullwords" class="col-sm-4 col-form-label">{{#str}}searchfullwords, forum{{/str}}</label>
+            <div class="col-sm-8">
+                <input type="text" class="form-control" name="fullwords" id="fullwords" value="{{fullwords}}">
+            </div>
+        </div>
+        {{/showfullwords}}
+        <div class="form-group row" role="group" aria-labelledby="searchdatefromlabel">
+            <div class="col-sm-4 col-form-label" id="searchdatefromlabel">{{#str}}searchdatefrom, forum{{/str}}</div>
+            <div class="col-sm-8 fdate_time_selector d-flex flex-wrap align-items-center">
+                <div class="form-check">
+                    <label class="form-check-label me-1">
+                        <input type="checkbox" name="timefromrestrict" value="1" {{#datefromchecked}}checked{{/datefromchecked}} class="form-check-input"> {{#str}}enable{{/str}}
+                    </label>
+                </div>
+                {{{datefromfields}}}
+                <input type="hidden" name="hfromday" value="0">
+                <input type="hidden" name="hfrommonth" value="0">
+                <input type="hidden" name="hfromyear" value="0">
+                <input type="hidden" name="hfromhour" value="0">
+                <input type="hidden" name="hfromminute" value="0">
+            </div>
+        </div>
+        <div class="form-group row" role="group" aria-labelledby="searchdatetolabel">
+            <div class="col-sm-4 col-form-label" id="searchdatetolabel">{{#str}}searchdateto, forum{{/str}}</div>
+            <div class="col-sm-8 fdate_time_selector d-flex flex-wrap align-items-center">
+                <div class="form-check">
+                    <label class="form-check-label me-1">
+                        <input type="checkbox" name="timetorestrict" value="1" {{#datetochecked}}checked{{/datetochecked}} class="form-check-input"> {{#str}}enable{{/str}}
+                    </label>
+                </div>
+                {{{datetofields}}}
+                <input type="hidden" name="htoday" value="0">
+                <input type="hidden" name="htomonth" value="0">
+                <input type="hidden" name="htoyear" value="0">
+                <input type="hidden" name="htohour" value="0">
+                <input type="hidden" name="htominute" value="0">
+            </div>
+        </div>
+        <div class="form-group row">
+            <label for="menuforumid" class="col-sm-4 col-form-label">{{#str}}searchwhichforums, forum{{/str}}</label>
+            <div class="col-sm-8">
+                <select name="forumid" id="menuforumid" class="custom-select">
+                    {{#forumoptions}}
+                        <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
+                    {{/forumoptions}}
+                </select>
+            </div>
+        </div>
+        <div class="form-group row">
+            <label for="subject" class="col-sm-4 col-form-label">{{#str}}searchsubject, forum{{/str}}</label>
+            <div class="col-sm-8">
+                <input type="text" class="form-control" name="subject" id="subject" value="{{subject}}">
+            </div>
+        </div>
+        <div class="form-group row">
+            <label for="user" class="col-sm-4 col-form-label">{{#str}}searchuser, forum{{/str}}</label>
+            <div class="col-sm-8">
+                <input type="text" class="form-control" name="user" id="user" value="{{user}}">
+            </div>
+        </div>
+        {{^guestuser}}
+        <div class="form-group row">
+            <div class="col-sm-4"></div>
+            <div class="col-sm-8">
+                <div class="form-check">
+                    <input type="checkbox" class="form-check-input" name="starredonly" id="starredonly" value="1" {{#starredonly}}checked{{/starredonly}} />
+                    <label for="starredonly" class="form-check-label">{{#str}}starredonly, forum{{/str}}</label>
+                </div>
+            </div>
+        </div>
+        {{/guestuser}}
+        {{#tagsenabled}}
+        <div class="form-group row">
+            <label for="tags" class="col-sm-4 col-form-label">{{#str}}searchtags, forum{{/str}}</label>
+            <div class="col-sm-8">
+                <select class="form-select" name="tags[]" id="tags" multiple>
+                    {{#tagoptions}}
+                        <option value="{{value}}" {{#selected}}selected{{/selected}}>{{{text}}}</option>
+                    {{/tagoptions}}
+                </select>
+            </div>
+        </div>
+        {{/tagsenabled}}
+        <div class="form-group row">
+            <div class="col-sm-4"></div>
+            <div class="col-sm-8">
+                <button type="submit" class="btn btn-primary">{{#str}}searchforums, forum{{/str}}</button>
+            </div>
+        </div>
     </form>
 </div>
 {{#js}}

From d28895b921d87e05f932c9e8c52240d02ad94873 Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Wed, 22 Oct 2025 23:49:44 +0800
Subject: [PATCH 3/3] MDL-86840 forum: Add accessibility Behat coverage

* Add accessibility Behat coverage on the Advanced forum search page.
---
 mod/forum/tests/behat/advanced_search.feature | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mod/forum/tests/behat/advanced_search.feature b/mod/forum/tests/behat/advanced_search.feature
index c1e1ee7fcf8..b3fa6dbb6ff 100644
--- a/mod/forum/tests/behat/advanced_search.feature
+++ b/mod/forum/tests/behat/advanced_search.feature
@@ -90,7 +90,7 @@ Feature: The forum search allows users to perform advanced searches for forum po
     Then I should not see "My message"
     And I should see "Your subjective"
 
-  @javascript
+  @javascript @accessibility
   Scenario: Perform an advanced search using tags
     Given I am on the "Announcements" "forum activity" page logged in as teacher1
     And I follow "My subject"
@@ -105,6 +105,7 @@ Feature: The forum search allows users to perform advanced searches for forum po
     When I press "Search"
     Then I should see "My subject"
     And I should not see "Your subjective"
+    And the "region-main" "region" should meet accessibility standards with "best-practice" extra tests
 
   @javascript
   Scenario: Perform an advanced search on starred discussions without text