From 3f95330d107cf9a3e15cb59064875e62de671203 Mon Sep 17 00:00:00 2001 From: Alexander Bias <alexander.bias@uni-ulm.de> Date: Sat, 28 Nov 2020 21:16:39 +0100 Subject: [PATCH] Adjusted navbar.mustache due to upstream changes in theme Boost core. --- CHANGES.md | 1 + templates/navbar.mustache | 31 +++++++++++++++++++++------- templates/navbar.mustache.original | 33 +++++++++++++++++++++++------- 3 files changed, 51 insertions(+), 14 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 924a51a..844ec0f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,7 @@ Changes ### Unreleased +* 2020-11-28 - Adjusted navbar.mustache due to upstream changes in theme Boost core. * 2020-11-28 - Prepare compatibility for Moodle 3.10. * 2020-11-18 - Change in Moodle release support: For the time being, this plugin is maintained for the most recent LTS release of Moodle as well as the most recent major release of Moodle. diff --git a/templates/navbar.mustache b/templates/navbar.mustache index 5784171..f066e8c 100644 --- a/templates/navbar.mustache +++ b/templates/navbar.mustache @@ -15,9 +15,27 @@ along with Moodle. If not, see <http://www.gnu.org/licenses/>. }} {{! + @template theme_boost_campus/navbar - Page navbar. + This template renders the top navbar. + + Example context (json): + { + "output": { + "should_display_navbar_logo": true, + "get_compact_logo_url": "http://placekitten.com/50/50", + "custom_menu": "<li>..</li>", + "page_heading_menu": "<li>..</li>", + "search_box": "<div><input type='text'></div>", + "navbar_plugin_output": "<div class='dropdown'>Messaging</div>", + "user_menu": "<div class='dropdown'>John Doe</div>" + }, + "config": { + "wwwroot": "#" + }, + "sitename": "Moodle Site" + } }} {{! Modifications: @@ -49,19 +67,18 @@ <!-- page_heading_menu --> {{{ output.page_heading_menu }}} </ul> - <ul class="nav navbar-nav ml-auto"> - <li class="d-none d-lg-block"> - {{{ output.search_box }}} - </li> + <div class="ml-auto"> + {{{ output.search_box }}} + </div> + <ul class="nav navbar-nav usernav"> <!-- navbar_plugin_output --> <li class="nav-item"> {{{ output.navbar_plugin_output }}} </li> <!-- user_menu --> - <li class="nav-item d-flex align-items-center"> + <li class="nav-item align-items-center pl-2"> {{{ output.user_menu }}} </li> </ul> <!-- search_box --> </nav> - diff --git a/templates/navbar.mustache.original b/templates/navbar.mustache.original index c93e68f..e38b64a 100644 --- a/templates/navbar.mustache.original +++ b/templates/navbar.mustache.original @@ -15,7 +15,27 @@ along with Moodle. If not, see <http://www.gnu.org/licenses/>. }} {{! - Page navbar. + + @template theme_boost/navbar + + This template renders the top navbar. + + Example context (json): + { + "output": { + "should_display_navbar_logo": true, + "get_compact_logo_url": "http://placekitten.com/50/50", + "custom_menu": "<li>..</li>", + "page_heading_menu": "<li>..</li>", + "search_box": "<div><input type='text'></div>", + "navbar_plugin_output": "<div class='dropdown'>Messaging</div>", + "user_menu": "<div class='dropdown'>John Doe</div>" + }, + "config": { + "wwwroot": "#" + }, + "sitename": "Moodle Site" + } }} <nav class="fixed-top navbar navbar-light bg-white navbar-expand moodle-has-zindex" aria-label="{{#str}}sitemenubar, admin{{/str}}"> @@ -42,19 +62,18 @@ <!-- page_heading_menu --> {{{ output.page_heading_menu }}} </ul> - <ul class="nav navbar-nav ml-auto"> - <li class="d-none d-lg-block"> - {{{ output.search_box }}} - </li> + <div class="ml-auto"> + {{{ output.search_box }}} + </div> + <ul class="nav navbar-nav usernav"> <!-- navbar_plugin_output --> <li class="nav-item"> {{{ output.navbar_plugin_output }}} </li> <!-- user_menu --> - <li class="nav-item d-flex align-items-center"> + <li class="nav-item align-items-center pl-2"> {{{ output.user_menu }}} </li> </ul> <!-- search_box --> </nav> - -- GitLab