From 4f6396eb310b58829a833c8717e11409a59b42f0 Mon Sep 17 00:00:00 2001
From: Sameer Ahmed <itssameer@gmail.com>
Date: Thu, 23 Sep 2021 16:43:50 -0500
Subject: [PATCH] Nav-Drawer Button Position

Feature: #19
-Changed the position of Nav-Drawer button
-Added a new Chevron icon/button to close Nav-Drawer
-Nav-Drawer can be closed using any of the two icons/buttons
---
 classes/output/core_renderer.php |  1 +
 style/wet-boew-moodle.css        | 10 ++++++++++
 templates/footer.mustache        |  2 +-
 templates/header.mustache        |  5 +++++
 templates/nav-drawer.mustache    |  3 +++
 templates/navbar.mustache        |  5 -----
 6 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/classes/output/core_renderer.php b/classes/output/core_renderer.php
index b5209cb..2a5a361 100644
--- a/classes/output/core_renderer.php
+++ b/classes/output/core_renderer.php
@@ -111,6 +111,7 @@ public function full_header() {
         $header->searchurl = $_PAGE['searchurl'];
         $header->searchsettings = $_PAGE['searchsettings'];
         $header->sitename = $_PAGE['sitename'];
+        $header->shownavdrawer = $_PAGE['shownavdrawer'];
         $header->navdraweropen = $_PAGE['navdraweropen'];
         $header->showaccountsettings = $_PAGE['showaccountsettings'];
         $header->loggedin = $_PAGE['loggedin'];
diff --git a/style/wet-boew-moodle.css b/style/wet-boew-moodle.css
index 5b32c86..f9299a3 100644
--- a/style/wet-boew-moodle.css
+++ b/style/wet-boew-moodle.css
@@ -1643,3 +1643,13 @@ body.path-mod-feedback div.feedback-item-label span.d-inline-block {
     height: 2.7rem;
     font-size: 1.4rem
 }
+
+.nav-drawer-chevron-button{
+    top:0; 
+    left:250px;
+    position: absolute;
+}
+
+.nav-drawer-chevron-button:hover{
+    cursor: pointer;
+}
diff --git a/templates/footer.mustache b/templates/footer.mustache
index d63ebcc..df333ee 100644
--- a/templates/footer.mustache
+++ b/templates/footer.mustache
@@ -86,6 +86,6 @@
 
         <div id="level-access-access-assistant-highlight-container" data-ae_invis="true"></div>
         {{#shownavdrawer}}
-        {{> theme_boost/nav-drawer }}
+        {{> theme_gcweb/nav-drawer }}
         {{/shownavdrawer}}
         {{{ output.standard_end_of_body_html }}}
diff --git a/templates/header.mustache b/templates/header.mustache
index a777088..7655a48 100644
--- a/templates/header.mustache
+++ b/templates/header.mustache
@@ -61,6 +61,11 @@
             <div class="container">
                 <div class="row">
                     <section class="col-sm-7 col-xs-12">
+                        {{#shownavdrawer}}
+                            <div data-region="drawer-toggle" class="d-inline-block mr-3">
+                                <button aria-expanded="{{#navdraweropen}}true{{/navdraweropen}}{{^navdraweropen}}false{{/navdraweropen}}" aria-controls="nav-drawer" type="button" class="btn mr-1 mb-3 btn-light bg-gray" data-action="toggle-drawer" data-side="left" data-preference="drawer-open-nav">{{#pix}}i/menubars{{/pix}}<span class="sr-only">{{#str}}sidepanel, core{{/str}}</span></button>
+                            </div>
+                        {{/shownavdrawer}}
                         <h2 class="wb-inv">{{{ sitename }}}</h2>
                        <a class="app-name" href="{{{ wwwroot }}}">{{{ sitename }}}</a>
                     </section>
diff --git a/templates/nav-drawer.mustache b/templates/nav-drawer.mustache
index 26e7f1e..31af3ce 100644
--- a/templates/nav-drawer.mustache
+++ b/templates/nav-drawer.mustache
@@ -18,5 +18,8 @@
     @template theme_gcweb/nav-drawer
 }}
 <div id="nav-drawer" data-region="drawer" class="d-print-none moodle-has-zindex {{^navdraweropen}}closed{{/navdraweropen}}" aria-hidden="{{#navdraweropen}}false{{/navdraweropen}}{{^navdraweropen}}true{{/navdraweropen}}" tabindex="-1">
+    <div data-region="drawer-toggle" class="icon-size-5 nav-drawer-chevron-button" aria-expanded="{{#navdraweropen}}true{{/navdraweropen}}{{^navdraweropen}}false{{/navdraweropen}}" aria-controls="nav-drawer" data-action="toggle-drawer" data-side="left" data-preference="drawer-open-nav">
+        <i class="icon fa fa-angle-double-left"></i>    
+    </div>
     {{> theme_boost/flat_navigation }}
 </div>
diff --git a/templates/navbar.mustache b/templates/navbar.mustache
index 091e917..d87c492 100644
--- a/templates/navbar.mustache
+++ b/templates/navbar.mustache
@@ -21,9 +21,4 @@
 }}
                     <div id="navbar" class="context-header-settings-menu">
                         {{{ output.settings_menu }}} {{{ pagebutton }}}
-                        {{#shownavdrawer}}
-                        <div data-region="drawer-toggle" class="d-inline-block mr-3">
-                            <button aria-expanded="{{#navdraweropen}}true{{/navdraweropen}}{{^navdraweropen}}false{{/navdraweropen}}" aria-controls="nav-drawer" type="button" class="btn nav-link float-sm-right mr-1 btn-light bg-gray" data-action="toggle-drawer" data-side="left" data-preference="drawer-open-nav">{{#pix}}i/menubars{{/pix}}<span class="sr-only">{{#str}}sidepanel, core{{/str}}</span></button>
-                        </div>
-                        {{/shownavdrawer}}
                     </div>