Merge pull request #189 from stopfstedt/MOODLE_404_STABLE

updates theme for Moodle 4.4
ucsf-education · Sep 26, 2024 · 24bd2cd · 24bd2cd
2 parents 38ef9da + 2d54413
commit 24bd2cd
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 29 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -34,8 +34,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ["8.1", "8.2"]
-        moodle-branch: ["MOODLE_403_STABLE"]
+        php: ["8.2", "8.3"]
+        moodle-branch: ["MOODLE_404_STABLE"]
         database: [pgsql, mariadb]
 
     steps:

diff --git a/pix_plugins/mod/customcert/monologo.png b/pix_plugins/mod/customcert/monologo.png
diff --git a/pix_plugins/mod/folder/monologo.png b/pix_plugins/mod/folder/monologo.png
diff --git a/pix_plugins/mod/kalvidassign/monologo.png b/pix_plugins/mod/kalvidassign/monologo.png
diff --git a/pix_plugins/mod/kalvidres/monologo.png b/pix_plugins/mod/kalvidres/monologo.png
diff --git a/pix_plugins/mod/oublog/monologo.png b/pix_plugins/mod/oublog/monologo.png
diff --git a/pix_plugins/mod/page/monologo.png b/pix_plugins/mod/page/monologo.png
diff --git a/templates/banneralerts.mustache b/templates/banneralerts.mustache
@@ -30,8 +30,9 @@
     <div class="ucsf-banneralerts-container row pt-3">
         {{#alerts}}
             <div class="col-12">
-                <div class="alert alert-dismissible ucsf-banneralerts-alert {{classes}}"
+                <div class="alert alert-block fade in alert-dismissible ucsf-banneralerts-alert {{classes}}"
                      role="alert"
+                     data-aria-autofocus="true"
                      data-ucsf-banneralerts-alert-id="{{id}}"
                      data-ucsf-banneralert-dismiss-callback-url="{{url}}"
                 >

diff --git a/templates/drawers.mustache b/templates/drawers.mustache
@@ -40,7 +40,7 @@
             "favicon": "favicon.ico",
             "main_content": "<h1>Headings make html validators happier</h1>"
         },
-        "bodyattributes": "",
+        "bodyattributes":"",
         "sidepreblocks": "<h2>Blocks html goes here</h2>",
         "hasblocks":true,
         "courseindexopen": true,
@@ -102,13 +102,13 @@
                 {{#courseindex}}
                     <div class="drawer-toggler drawer-left-toggle open-nav d-print-none">
                         <button
-                                class="btn icon-no-margin"
-                                data-toggler="drawers"
-                                data-action="toggle"
-                                data-target="theme_boost-drawers-courseindex"
-                                data-toggle="tooltip"
-                                data-placement="right"
-                                title="{{#str}}opendrawerindex, core{{/str}}"
+                            class="btn icon-no-margin"
+                            data-toggler="drawers"
+                            data-action="toggle"
+                            data-target="theme_boost-drawers-courseindex"
+                            data-toggle="tooltip"
+                            data-placement="right"
+                            title="{{#str}}opendrawerindex, core{{/str}}"
                         >
                             <span class="sr-only">{{#str}}opendrawerindex, core{{/str}}</span>
                             {{#pix}} t/index_drawer, moodle {{/pix}}
@@ -118,13 +118,13 @@
                 {{#hasblocks}}
                     <div class="drawer-toggler drawer-right-toggle ml-auto d-print-none">
                         <button
-                                class="btn icon-no-margin"
-                                data-toggler="drawers"
-                                data-action="toggle"
-                                data-target="theme_boost-drawers-blocks"
-                                data-toggle="tooltip"
-                                data-placement="right"
-                                title="{{#str}}opendrawerblocks, core{{/str}}"
+                            class="btn icon-no-margin"
+                            data-toggler="drawers"
+                            data-action="toggle"
+                            data-target="theme_boost-drawers-blocks"
+                            data-toggle="tooltip"
+                            data-placement="right"
+                            title="{{#str}}opendrawerblocks, core{{/str}}"
                         >
                             <span class="sr-only">{{#str}}opendrawerblocks, core{{/str}}</span>
                             <span class="dir-rtl-hide">{{#pix}}t/blocks_drawer, core{{/pix}}</span>
@@ -142,9 +142,9 @@
             <div id="page-content" class="pb-3 d-print-block">
                 <div id="region-main-box">
                     {{#hasregionmainsettingsmenu}}
-                        <div id="region-main-settings-menu" class="d-print-none">
-                            <div> {{{ regionmainsettingsmenu }}} </div>
-                        </div>
+                    <div id="region-main-settings-menu" class="d-print-none">
+                        <div> {{{ regionmainsettingsmenu }}} </div>
+                    </div>
                     {{/hasregionmainsettingsmenu}}
                     <section id="region-main" aria-label="{{#str}}content{{/str}}">
 
@@ -180,9 +180,9 @@
 </body>
 </html>
 {{#js}}
-    M.util.js_pending('theme_boost/loader');
-    require(['theme_boost/loader', 'theme_boost/drawer'], function(Loader, Drawer) {
+M.util.js_pending('theme_boost/loader');
+require(['theme_boost/loader', 'theme_boost/drawer'], function(Loader, Drawer) {
     Drawer.init();
     M.util.js_complete('theme_boost/loader');
-    });
+});
 {{/js}}
diff --git a/version.php b/version.php
@@ -24,9 +24,9 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->component = 'theme_ucsf';
-$plugin->version = 2024072400;
-$plugin->release = 'v4.3';
-$plugin->requires = 2023100400;
-$plugin->supported = [403, 403];
+$plugin->version = 2024092400;
+$plugin->release = 'v4.4';
+$plugin->requires = 2024041600;
+$plugin->supported = [404, 404];
 $plugin->maturity = MATURITY_STABLE;
-$plugin->dependencies = ['theme_boost' => 2023100400];
+$plugin->dependencies = ['theme_boost' => 2024042200];