Merge commit 'cdff40ecd3e75ad77f8767466a71cf6a35126b64' into css_snippets

Menrath · Menrath · commit ce84ed80dff5 · 2025-03-04T09:59:11.000+01:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -4,13 +4,23 @@ moodle-theme_boost_union
 Changes
 -------
 
-### Unreleased
+### v4.5-r8
+
+* 2025-02-17 - Bugfix: Remove the possibility to set the activity purpose for subsections to avoid that activities within subsections get tinted with the wrong color, resolves #823.
+* 2025-02-12 - Bugfix: Accessibility page link in description differed from real location, resolves #818.
+
+### v4.5-r7
+
+* 2025-02-11 - Bugfix: Using smart menus together with custom menus broke Moodle, resolves #814, regression of #602.
+* 2025-02-10 - Bugfix: Adopt accessibility changes from MDL-67683 which led to Boost Union Behat failures on Moodle core 4.5.2 and 4.4.6, resolves #813.
+               Please note: This change raises Boost Union's required Moodle core version to 4.5.2.
+
+### v4.5-r6
 
 * 2025-02-04 - Feature: Add first version of CSS snippets feature, credits go to all members of the MoodleMootDACH dev camp team 22.
 * 2025-02-04 - Improvement: Hide the 'Menu item mode' settings for smart menu items which are not of the 'dynamic courses' item type, resolves #804.
 * 2025-02-04 - Bugfix: Smart menu 3rd level submenus were being cut-off in responsive / mobile view, resolves #356.
-               Please note: This is a comparably large visual change which effectively replaces the presentation of a 3rd level smart menu (which can only be realized with dynamic courses menu items up to now). flyout menus in the main navigation area and the menu bar area with the 'sliding door' submenu behaviour which has been used in the user menu only up to now.
-               Please test your particular
+               Please note: This is a comparably large visual change which effectively replaces the presentation of a 3rd level smart menu (which can only be realized with dynamic courses menu items up to now). Flyout menus in the main navigation area and the menu bar area have been replaced with the 'sliding door' submenu behaviour which has been used in the user menu only up to now. If you are using dynamic courses menu items, please test your particular smart menu setup before updating to this Boost Union release.
 * 2025-02-04 - Bugfix: Smart menu 3rd level submenus had a font color which differed from the 2nd level and might have been even invisible, resolves #459.
 * 2025-02-04 - Bugfix: Long smart menus were not scrollable vertically, resolves #406.
 * 2025-02-04 - Bugfix: Fix smart menu dynamic course items not updating properly based on course role assignments, resolves #749.
diff --git a/classes/output/core_renderer.php b/classes/output/core_renderer.php
@@ -530,7 +530,7 @@ public function block(block_contents $bc, $region) {
         $context->skiptitle = strip_tags($bc->title);
         $context->showskiplink = !empty($context->skiptitle);
         $context->arialabel = $bc->arialabel;
-        $context->ariarole = !empty($bc->attributes['role']) ? $bc->attributes['role'] : 'complementary';
+        $context->ariarole = !empty($bc->attributes['role']) ? $bc->attributes['role'] : '';
         $context->class = $bc->attributes['class'];
         $context->type = $bc->attributes['data-block'];
         $context->title = $bc->title;
diff --git a/classes/output/navigation/primary.php b/classes/output/navigation/primary.php
@@ -355,8 +355,9 @@ public function build_usermenus(&$usermenu, $menus, $forusermenu = true) {
      */
     protected function convert_submenus($menus) {
 
-        // Verify the empty entries.
+        // If the given menu is empty for whatever reason.
         if (empty($menus)) {
+            // Return the menu directly.
             return $menus;
         }
 
@@ -366,10 +367,19 @@ protected function convert_submenus($menus) {
             return clone (object) $item;
         }, $menus);
 
+        // Iterate over the primary menu items.
         foreach ($primarymenu as $key => $parentmenu) {
 
-            // Menu doesn't contain any children menus, continue to the next menu.
+            // The given menu is not a smart menu (but most probably a Moodle core main navigation item or a custom menu).
+            if (!property_exists($parentmenu, 'menudata')) {
+                // We must not convert this menu unless we want to break Moodle completely.
+                // Continue to the next menu.
+                continue;
+            }
+
+            // The given menu doesn't contain any children menus or is card menu.
             if (!$parentmenu->haschildren || $parentmenu->card) {
+                // Continue to the next menu.
                 continue;
             }
 
diff --git a/db/upgrade.php b/db/upgrade.php
@@ -540,5 +540,14 @@ function xmldb_theme_boost_union_upgrade($oldversion) {
         snippets::add_builtin_snippets();
     }
 
+    if ($oldversion < 2024100716) {
+
+        // Remove the activitypurposesubsection setting from Boost Union.
+        unset_config('activitypurposesubsection', 'theme_boost_union');
+
+        // Boost_union savepoint reached.
+        upgrade_plugin_savepoint(true, 2024100716, 'theme', 'boost_union');
+    }
+
     return true;
 }
diff --git a/lib.php b/lib.php
@@ -214,8 +214,8 @@ function theme_boost_union_get_pre_scss($theme) {
     // Instead, we must only add additionally CSS code which is based on any Boost Union-only functionality.
 
     // But, well, there is one exception: Boost Union Child themes.
-    // Due to the described call chain, Boost Union Child won't get all the necessary extra SCSS.
-    // Thus, we fetch Boost's extra SCSS if the current theme is not Union itself (i.e. a Boost Union Child theme is active).
+    // Due to the described call chain, Boost Union Child won't get all the necessary pre SCSS.
+    // Thus, we fetch Boost's pre SCSS if the current theme is not Union itself (i.e. a Boost Union Child theme is active).
     if (theme_boost_union_is_active_childtheme() == true) {
         $scss .= theme_boost_get_pre_scss(\core\output\theme_config::load('boost_union'));
     }
diff --git a/settings.php b/settings.php
@@ -624,6 +624,12 @@
         $installedactivities = get_module_types_names();
         // Iterate over all existing activities.
         foreach ($installedactivities as $modname => $modinfo) {
+            // If this is the subsection activity type which must not be tinted itself.
+            if ($modname == 'subsection') {
+                // Skip it.
+                continue;
+            }
+
             // Get default purpose of activity module.
             $defaultpurpose = plugin_supports('mod', $modname, FEATURE_MOD_PURPOSE, MOD_PURPOSE_OTHER);
             // If the plugin does not have any default purpose.
@@ -2879,7 +2885,7 @@
         // Setting: Declaration of accessibility page link position.
         $name = 'theme_boost_union/accessibilitydeclarationlinkposition';
         $title = get_string('accessibilitydeclarationlinkpositionsetting', 'theme_boost_union', null, true);
-        $pageurl = theme_boost_union_get_staticpage_link('accessibility');
+        $pageurl = theme_boost_union_get_accessibility_link('declaration');
         $description = get_string('accessibilitydeclarationlinkpositionsetting_desc', 'theme_boost_union', ['url' => $pageurl],
                 true);
         $linkpositionoption =
diff --git a/templates/theme_boost/columns2.mustache b/templates/theme_boost/columns2.mustache
@@ -86,7 +86,7 @@
                     <div> {{{ regionmainsettingsmenu }}} </div>
                 </div>
                 {{/hasregionmainsettingsmenu}}
-                <section id="region-main" {{#hasblocks}}class="has-blocks mb-3"{{/hasblocks}} aria-label="{{#str}}content{{/str}}">
+                <div id="region-main" {{#hasblocks}}class="has-blocks mb-3"{{/hasblocks}}>
 
                     {{#hasregionmainsettingsmenu}}
                         <div class="region_main_settings_menu_proxy"></div>
@@ -103,12 +103,12 @@
                     {{{ output.activity_navigation }}}
                     {{{ output.course_content_footer }}}
 
-                </section>
+                </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/templates/theme_boost/columns2.mustache.upstream b/templates/theme_boost/columns2.mustache.upstream
@@ -73,7 +73,7 @@
                     <div> {{{ regionmainsettingsmenu }}} </div>
                 </div>
                 {{/hasregionmainsettingsmenu}}
-                <section id="region-main" {{#hasblocks}}class="has-blocks mb-3"{{/hasblocks}} aria-label="{{#str}}content{{/str}}">
+                <div id="region-main" {{#hasblocks}}class="has-blocks mb-3"{{/hasblocks}}>
 
                     {{#hasregionmainsettingsmenu}}
                         <div class="region_main_settings_menu_proxy"></div>
@@ -89,12 +89,12 @@
                     {{{ output.activity_navigation }}}
                     {{{ output.course_content_footer }}}
 
-                </section>
+                </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/templates/theme_boost/drawers.mustache b/templates/theme_boost/drawers.mustache
@@ -93,10 +93,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}}
@@ -212,7 +212,7 @@
                         <div> {{{ regionmainsettingsmenu }}} </div>
                     </div>
                     {{/hasregionmainsettingsmenu}}
-                    <section id="region-main" aria-label="{{#str}}content{{/str}}">
+                    <div id="region-main">
 
                         {{#hasregionmainsettingsmenu}}
                             <div class="region_main_settings_menu_proxy"></div>
@@ -251,7 +251,7 @@
                             {{> theme_boost_union/slider }}
                         {{/sliderpositionafterafter}}
 
-                    </section>
+                    </div>
                 </div>
             </div>
             {{#regions.contentlower.hasblocks}}
diff --git a/templates/theme_boost/drawers.mustache.upstream b/templates/theme_boost/drawers.mustache.upstream
@@ -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}}
@@ -142,7 +142,7 @@
                         <div> {{{ regionmainsettingsmenu }}} </div>
                     </div>
                     {{/hasregionmainsettingsmenu}}
-                    <section id="region-main" aria-label="{{#str}}content{{/str}}">
+                    <div id="region-main">
 
                         {{#hasregionmainsettingsmenu}}
                             <div class="region_main_settings_menu_proxy"></div>
@@ -162,7 +162,7 @@
                         {{{ output.activity_navigation }}}
                         {{{ output.course_content_footer }}}
 
-                    </section>
+                    </div>
                 </div>
             </div>
         </div>
diff --git a/templates/theme_boost/login.mustache b/templates/theme_boost/login.mustache
@@ -51,13 +51,13 @@
         {{> theme_boost_union/infobanners }}
         <div id="page-content" class="row">
             <div id="region-main-box" class="col-12">
-                <section id="region-main" class="col-12 h-100" aria-label="{{#str}}content{{/str}}">
+                <div id="region-main" class="col-12 h-100">
                 <div class="login-wrapper {{loginwrapperclass}}">
                     <div class="login-container {{logincontainerclass}}">
                     {{{ output.main_content }}}
                     </div>
                 </div>
-                </section>
+                </div>
             </div>
         </div>
     </div>
diff --git a/templates/theme_boost/login.mustache.upstream b/templates/theme_boost/login.mustache.upstream
@@ -41,13 +41,13 @@
     <div id="page" class="container-fluid pt-5 mt-0">
         <div id="page-content" class="row">
             <div id="region-main-box" class="col-12">
-                <section id="region-main" class="col-12 h-100" aria-label="{{#str}}content{{/str}}">
+                <div id="region-main" class="col-12 h-100">
                 <div class="login-wrapper">
                     <div class="login-container">
                     {{{ output.main_content }}}
                     </div>
                 </div>
-                </section>
+                </div>
             </div>
         </div>
     </div>
diff --git a/tests/behat/theme_boost_union_looksettings_activitybranding.feature b/tests/behat/theme_boost_union_looksettings_activitybranding.feature
@@ -35,6 +35,33 @@ Feature: Configuring the theme_boost_union plugin for the "Activity branding" ta
       | content            | book    | #FFFF00  | invert(0.49) sepia(0.52) saturate(46.75) hue-rotate(156deg) brightness(0.89) contrast(1.02) |
       | interactivecontent | lesson  | #00FFFF  | invert(0.25) sepia(0.63) saturate(11.52) hue-rotate(344deg) brightness(0.94) contrast(0.91) |
 
+  @javascript
+  Scenario Outline: Setting: Activity icon colors - Setting the color (for activities in subsections)
+    Given I enable "subsection" "mod" plugin
+    And the following "courses" exist:
+      | fullname           | shortname | category | numsections | initsections |
+      | Subsectioncourse 1 | SC1       | 0        | 3           | 1            |
+    And the following "activities" exist:
+      | activity   | name             		   | course | idnumber | section |
+      | subsection | Subsection1      	     | SC1    | sub      | 1       |
+      | <modname>  | Activity in Subsection1 | SC1    | subact   | 4       |
+    And the following config values are set as admin:
+      | config                         | value      | plugin            |
+      | activityiconcolor<purposename> | <colorhex> | theme_boost_union |
+      | activityiconcolorfidelity      | 500        | theme_boost_union |
+    And the theme cache is purged and the theme is reloaded
+    When I log in as "admin"
+    And I am on "Subsectioncourse 1" course homepage
+    # First, we test that the default filter is _not_ set anymore.
+    Then DOM element ".modtype_subsection .modtype_<modname> .activityicon" should not have computed style "filter" "<originalfilter>"
+    # And then, as the hex color to CSS filter conversion results are not reproducible, we test if the applied filter is close enough to the hex color.
+    And DOM element ".modtype_subsection .modtype_<modname> .activityicon" should have a CSS filter close enough to hex color "<colorhex>"
+
+    # We only test one example. That's enough to verify that subsections work.
+    Examples:
+      | purposename | modname | colorhex  | originalfilter                                                                              |
+      | content     | book    | #FFFF00 | invert(0.49) sepia(0.52) saturate(46.75) hue-rotate(156deg) brightness(0.89) contrast(1.02) |
+
   @javascript
   Scenario Outline: Setting: Activity icon purposes - Setting the purpose
     Given I log in as "admin"
@@ -63,6 +90,31 @@ Feature: Configuring the theme_boost_union plugin for the "Activity branding" ta
       | Book       | Name            | Communication | book   | invert(0.48) sepia(0.74) saturate(48.87) hue-rotate(11deg) brightness(1.02) contrast(1.01) |
       | Assignment | Assignment name | Other         | assign | none                                                                                       |
 
+  @javascript
+  Scenario Outline: Setting: Activity icon purposes - Setting the purpose (for activities in subsections)
+    Given I enable "subsection" "mod" plugin
+    And the following "courses" exist:
+      | fullname           | shortname | category | numsections | initsections |
+      | Subsectioncourse 1 | SC1       | 0        | 3           | 1            |
+    And the following "activities" exist:
+      | activity   | name             		   | course | idnumber | section |
+      | subsection | Subsection1      	     | SC1    | sub      | 1       |
+      | <mod>      | Activity in Subsection1 | SC1    | subact   | 4       |
+    And I log in as "admin"
+    And Behat debugging is disabled
+    And I navigate to "Appearance > Boost Union > Look" in site administration
+    And I click on "Activity branding" "link" in the "#adminsettings .nav-tabs" "css_element"
+    And I select "<purpose>" from the "<modname>" singleselect
+    And I press "Save changes"
+    And Behat debugging is enabled
+    When I am on "Subsectioncourse 1" course homepage
+    Then DOM element ".modtype_subsection .modtype_<mod> .activityicon" should have computed style "filter" "<filter>"
+
+    # We only test one example. That's enough to verify that subsections work.
+    Examples:
+      | modname | titlesetting | purpose       | mod  | filter                                                                                     |
+      | Book    | Name         | Communication | book | invert(0.48) sepia(0.74) saturate(48.87) hue-rotate(11deg) brightness(1.02) contrast(1.01) |
+
   @javascript @_file_upload
   Scenario Outline: Setting: Custom icons files - Upload custom icons files
     Given the following config values are set as admin:
diff --git a/tests/behat/theme_boost_union_smartmenusettings_menus_application.feature b/tests/behat/theme_boost_union_smartmenusettings_menus_application.feature
@@ -84,3 +84,41 @@ Feature: Configuring the theme_boost_union plugin on the "Smart menus" page, app
     And I add a smart menu static item item "Privacy" "https://moodle.org/privacy"
     Then I should see "Bottom" in the "SmartMenu Policy" "table_row"
     And I should see smart menu "SmartMenu Policy" in location "Bottom"
+
+  @javascript
+  Scenario: Smartmenu: Menus: Application - Show a smart menu in the main navigation together with a custom menu
+    Given I log in as "admin"
+    And I navigate to "Appearance > Advanced theme settings" in site administration
+    And I set the field "Custom menu items" to multiline:
+    """
+    Custom menu
+    -Custom node 1|/foo/
+    -Custom node 2|/bar/foobar.php
+    """
+    And I press "Save changes"
+    And the following "theme_boost_union > smart menu" exists:
+      | title    | Smart menu      |
+      | location | Main navigation |
+    And the following "theme_boost_union > smart menu item" exists:
+      | menu     | Smart menu        |
+      | title    | Smart menu node 1 |
+      | itemtype | Static            |
+      | url      | /foooo            |
+    And the following "theme_boost_union > smart menu item" exists:
+      | menu     | Smart menu        |
+      | title    | Smart menu node 2 |
+      | itemtype | Static            |
+      | url      | /baaar            |
+    And I log out
+    And I log in as "user1"
+    # Resize the window to avoid that menus fall into the "More" menu and influence this test.
+    And I change window size to "large"
+    Then I should see smart menu "Smart menu" in location "Main"
+    And "Smart menu node 1" "theme_boost_union > Smart menu item" should exist in the "Smart menu" "theme_boost_union > Main menu smart menu"
+    And "Smart menu node 2" "theme_boost_union > Smart menu item" should exist in the "Smart menu" "theme_boost_union > Main menu smart menu"
+    And I should see "Custom menu" in the "nav" "css_element"
+    And I click on "Custom menu" "link" in the "nav" "css_element"
+    And I should see "Custom node 1" in the "nav" "css_element"
+    And I should see "Custom node 2" in the "nav" "css_element"
+    And "Custom menu" "link" should appear before "Smart menu" "link" in the "nav" "css_element"
+    And "My courses" "link" should appear before "Custom menu" "link" in the "nav" "css_element"
diff --git a/tests/generator/lib.php b/tests/generator/lib.php
diff --git a/version.php b/version.php

Original file line number	Diff line number	Diff line change
`@@ -540,5 +540,14 @@ function xmldb_theme_boost_union_upgrade($oldversion) {`
`540`	`540`	`snippets::add_builtin_snippets();`
`541`	`541`	`}`
`542`	`542`
	`543`	`+ if ($oldversion < 2024100716) {`
	`544`	`+`
	`545`	`+ // Remove the activitypurposesubsection setting from Boost Union.`
	`546`	`+ unset_config('activitypurposesubsection', 'theme_boost_union');`
	`547`	`+`
	`548`	`+ // Boost_union savepoint reached.`
	`549`	`+ upgrade_plugin_savepoint(true, 2024100716, 'theme', 'boost_union');`
	`550`	`+ }`
	`551`	`+`
`543`	`552`	`return true;`
`544`	`553`	`}`