From 03adce20fc52cbdc99ac49015eff9ff6faab461e Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Fri, 21 Jun 2024 16:52:22 +0800
Subject: [PATCH] MDL-67683 theme: Do not use section for block containers

The containers for the blocks in layout templates should not be using a
<section> tag (which has a default landmark role of "region") as the
blocks are already contained in an <aside> tag that has the default
"complementary" role which should be a top-level landmark.

Read more at:
https://www.w3.org/WAI/ARIA/apg/practices/landmark-regions/
---
 theme/boost/templates/columns2.mustache  | 4 ++--
 theme/boost/templates/drawers.mustache   | 4 ++--
 theme/boost/templates/embedded.mustache  | 4 ++--
 theme/boost/templates/secure.mustache    | 4 ++--
 theme/classic/templates/columns.mustache | 8 ++++----
 theme/classic/templates/secure.mustache  | 8 ++++----
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/theme/boost/templates/columns2.mustache b/theme/boost/templates/columns2.mustache
index a5f3db4f938..12eae717834 100644
--- a/theme/boost/templates/columns2.mustache
+++ b/theme/boost/templates/columns2.mustache
@@ -91,10 +91,10 @@
 
                 </div>
                 {{#hasblocks}}
-                <section data-region="blocks-column" class="d-print-none" aria-label="{{#str}}blocks{{/str}}">
+                <div data-region="blocks-column" class="d-print-none">
                     {{{ addblockbutton }}}
                     {{{ sidepreblocks }}}
-                </section>
+                </div>
                 {{/hasblocks}}
             </div>
         </div>
diff --git a/theme/boost/templates/drawers.mustache b/theme/boost/templates/drawers.mustache
index 679332b2781..bd4cf97099d 100644
--- a/theme/boost/templates/drawers.mustache
+++ b/theme/boost/templates/drawers.mustache
@@ -79,10 +79,10 @@
             {{$id}}theme_boost-drawers-blocks{{/id}}
             {{$drawerclasses}}drawer drawer-right{{#blockdraweropen}} show{{/blockdraweropen}}{{/drawerclasses}}
             {{$drawercontent}}
-                <section class="d-print-none" aria-label="{{#str}}blocks{{/str}}">
+                <div class="d-print-none">
                     {{{ addblockbutton }}}
                     {{{ sidepreblocks }}}
-                </section>
+                </div>
             {{/drawercontent}}
             {{$drawerpreferencename}}drawer-open-block{{/drawerpreferencename}}
             {{$forceopen}}{{#forceblockdraweropen}}1{{/forceblockdraweropen}}{{/forceopen}}
diff --git a/theme/boost/templates/embedded.mustache b/theme/boost/templates/embedded.mustache
index fe8dff905a7..167ddd63953 100644
--- a/theme/boost/templates/embedded.mustache
+++ b/theme/boost/templates/embedded.mustache
@@ -56,9 +56,9 @@
 {{{ output.standard_top_of_body_html }}}
 <div id="page" {{#hasfakeblocks}}class="has-fake-blocks"{{/hasfakeblocks}}>
     {{#hasfakeblocks}}
-        <section class="embedded-blocks" aria-label="{{#str}}blocks{{/str}}">
+        <div class="embedded-blocks">
             {{{ fakeblocks }}}
-        </section>
+        </div>
     {{/hasfakeblocks}}
     <section class="embedded-main">
         {{#headercontent}}
diff --git a/theme/boost/templates/secure.mustache b/theme/boost/templates/secure.mustache
index c35d11225b6..75fe1a0e2c6 100644
--- a/theme/boost/templates/secure.mustache
+++ b/theme/boost/templates/secure.mustache
@@ -71,9 +71,9 @@
 
                 </div>
                 {{#hasblocks}}
-                <section data-region="blocks-column" aria-label="{{#str}}blocks{{/str}}">
+                <div data-region="blocks-column">
                     {{{ sidepreblocks }}}
-                </section>
+                </div>
                 {{/hasblocks}}
             </div>
         </div>
diff --git a/theme/classic/templates/columns.mustache b/theme/classic/templates/columns.mustache
index 2fdfa234fb3..bac5c5595e5 100644
--- a/theme/classic/templates/columns.mustache
+++ b/theme/classic/templates/columns.mustache
@@ -80,15 +80,15 @@
                 </div>
             </div>
             <div class="columnleft blockcolumn {{#haspreblocks}} has-blocks {{/haspreblocks}}">
-                <section data-region="blocks-column" class="d-print-none" aria-label="{{#str}}blocks{{/str}}">
+                <div data-region="blocks-column" class="d-print-none">
                     {{{ sidepreblocks }}}
-                </section>
+                </div>
             </div>
 
             <div class="columnright blockcolumn {{#haspostblocks}} has-blocks {{/haspostblocks}}">
-                <section data-region="blocks-column" class="d-print-none" aria-label="{{#str}}blocks{{/str}}">
+                <div data-region="blocks-column" class="d-print-none">
                     {{{ sidepostblocks }}}
-                </section>
+                </div>
             </div>
         </div>
     </div>
diff --git a/theme/classic/templates/secure.mustache b/theme/classic/templates/secure.mustache
index 74aaaa93913..9ba4aee7d87 100644
--- a/theme/classic/templates/secure.mustache
+++ b/theme/classic/templates/secure.mustache
@@ -85,15 +85,15 @@
                 </div>
             </div>
             <div class="columnleft {{#haspreblocks}} has-blocks {{/haspreblocks}}">
-                <section data-region="blocks-column" class="d-print-none" aria-label="{{#str}}blocks{{/str}}">
+                <div data-region="blocks-column" class="d-print-none">
                     {{{ sidepreblocks }}}
-                </section>
+                </div>
             </div>
 
             <div class="columnright {{#haspostblocks}} has-blocks {{/haspostblocks}}">
-                <section data-region="blocks-column" class="d-print-none" aria-label="{{#str}}blocks{{/str}}">
+                <div data-region="blocks-column" class="d-print-none">
                     {{{ sidepostblocks }}}
-                </section>
+                </div>
             </div>
         </div>
     </div>