From fa9b5ae87d41d14d34c15a19bdea1656eb0d771c Mon Sep 17 00:00:00 2001
From: Nanne Baars <nanne.baars@owasp.org>
Date: Thu, 22 Oct 2020 17:40:14 +0200
Subject: [PATCH] Remove option to hide menu with the lessons

---
 .../src/main/resources/static/css/main.css    | 40 +----------------
 .../main/resources/static/js/application.js   | 45 -------------------
 .../src/main/resources/templates/login.html   |  2 -
 .../main/resources/templates/main_new.html    |  6 ---
 .../resources/templates/registration.html     |  2 -
 5 files changed, 1 insertion(+), 94 deletions(-)

diff --git a/webgoat-container/src/main/resources/static/css/main.css b/webgoat-container/src/main/resources/static/css/main.css
index 94b97ad5d..5f0d380c1 100644
--- a/webgoat-container/src/main/resources/static/css/main.css
+++ b/webgoat-container/src/main/resources/static/css/main.css
@@ -104,24 +104,15 @@ img {
     font-weight: 700;
 }
 
-#header .toggle-navigation button:hover,
-#header .toggle-navigation button:active,
 #header button#toggle-mail:hover,
 #header button#toggle-mail:active {
     background: #e84c3d;
 }
 
-#header .toggle-navigation button:hover i,
 #header button#toggle-mail:hover i {
     color: #F6F6F6;
 }
 
-#header .toggle-navigation.toggle-left {
-    margin-top: 5px;
-    margin-left: 20px;
-    display: inline-block;
-}
-
 #header .btn-default {
     padding: 3px 9px;
     background: #F6F6F6;
@@ -157,7 +148,7 @@ img {
 
 #header #lesson-title-wrapper {
     display: inline-block;
-    margin: 0 0 0 20px;
+    margin: 0 0 0 30px;
 }
 
 #header .pull-right {
@@ -212,14 +203,6 @@ img {
     font-family: 'Source Sans Pro', Arial, sans-serif;
 }
 
-.main-content-toggle-left {
-    margin-left: 0;
-}
-
-.main-content-toggle-right {
-    margin-right: 240px;
-}
-
 /*==========================================================================
  lesson content / wrapper
  ========================================================================= */
@@ -797,27 +780,10 @@ fieldset[disabled] .btn-warning.active {
         padding-left: 0;
     }
 
-    #header .toggle-navigation.toggle-left {
-        float: left;
-    }
-
-    .sidebar {
-        margin-left: -240px;
-    }
-
-    .sidebar-toggle {
-        margin-left: 0;
-        width: 100%;
-    }
-
     .main-content-wrapper {
         margin-left: 0;
     }
 
-    .main-content-toggle-left {
-        margin-left: 660px;
-    }
-
     .sidebarRight {
         top: 160px;
         width: 100%;
@@ -931,10 +897,6 @@ cookie-container {
     overflow-x: hidden;
 }
 
-.sidebar-toggle {
-    margin-left: -240px;
-}
-
 #menu-container ul,
 #menu-container ul ul {
     margin: -2px 0 0;
diff --git a/webgoat-container/src/main/resources/static/js/application.js b/webgoat-container/src/main/resources/static/js/application.js
index 7a955728c..b95fa4a13 100644
--- a/webgoat-container/src/main/resources/static/js/application.js
+++ b/webgoat-container/src/main/resources/static/js/application.js
@@ -3,8 +3,6 @@ var app = function() {
     var init = function() {
 
         tooltips();
-        toggleMenuLeft();
-        toggleMenuRight();
         // menu is handled by angular
         //menu();
         togglePanel();
@@ -28,38 +26,6 @@ var app = function() {
 
     };
 
-    var toggleMenuLeft = function() {
-        $('#toggle-left').bind('click', function(e) {
-            if (!$('.sidebarRight').hasClass('.sidebar-toggle-right')) {
-                $('.sidebarRight').removeClass('sidebar-toggle-right');
-                $('.main-content-wrapper').removeClass('main-content-toggle-right');
-            }
-            $('.sidebar').toggleClass('sidebar-toggle');
-            $('.main-content-wrapper').toggleClass('main-content-toggle-left');
-            e.stopPropagation();
-        });
-    };
-
-    var toggleMenuRight = function() {
-        $('#toggle-right').bind('click', function(e) {
-
-            if (!$('.sidebar').hasClass('.sidebar-toggle')) {
-                $('.sidebar').addClass('sidebar-toggle');
-                $('.main-content-wrapper').addClass('main-content-toggle-left');
-            }
-            
-            $('.sidebarRight').toggleClass('sidebar-toggle-right animated bounceInRight');
-            $('.main-content-wrapper').toggleClass('main-content-toggle-right');
-
-            if ( $(window).width() < 660 ) {
-                $('.sidebar').removeClass('sidebar-toggle');
-                $('.main-content-wrapper').removeClass('main-content-toggle-left main-content-toggle-right');
-             };
-
-            e.stopPropagation();
-        });
-    };
-
     var closePanel = function() {
         $('.actions > .fa-times').click(function() {
             $(this).parent().parent().parent().fadeOut();
@@ -67,17 +33,6 @@ var app = function() {
 
     }
 
-    /*
-    var menu = function() {
-        $("#leftside-navigation .sub-menu a").click(function(e) {
-            $("#leftside-navigation ul ul").slideUp();
-            if (!$(this).next().is(":visible")) {
-                $(this).next().slideDown();
-            }
-              e.stopPropagation();
-        });
-    };
-    */
     //End functions
 
     //Dashboard functions
diff --git a/webgoat-container/src/main/resources/templates/login.html b/webgoat-container/src/main/resources/templates/login.html
index 9e525e619..bee48ffd7 100644
--- a/webgoat-container/src/main/resources/templates/login.html
+++ b/webgoat-container/src/main/resources/templates/login.html
@@ -13,8 +13,6 @@
         <div class="brand">
             <a th:href="@{/start.mvc}" class="logo"><span>Web</span>Goat</a>
         </div>
-        <div class="toggle-navigation toggle-left">
-        </div>
         <div class="lessonTitle">
         </div>
 
diff --git a/webgoat-container/src/main/resources/templates/main_new.html b/webgoat-container/src/main/resources/templates/main_new.html
index 16ee995e9..484732389 100644
--- a/webgoat-container/src/main/resources/templates/main_new.html
+++ b/webgoat-container/src/main/resources/templates/main_new.html
@@ -37,12 +37,6 @@
             <a th:href="@{/welcome.mvc}" class="logo"><span>Web</span>Goat</a>
         </div>
         <!--logo end-->
-        <div class="toggle-navigation toggle-left">
-            <button type="button" class="btn btn-default" id="toggle-menu" data-toggle="tooltip" data-placement="right"
-                    title="Toggle Navigation">
-                <i class="fa fa-bars"></i>
-            </button>
-        </div><!--toggle navigation end-->
         <div id="lesson-title-wrapper">
 
         </div><!--lesson title end-->
diff --git a/webgoat-container/src/main/resources/templates/registration.html b/webgoat-container/src/main/resources/templates/registration.html
index 705d77eeb..fc8a4e517 100644
--- a/webgoat-container/src/main/resources/templates/registration.html
+++ b/webgoat-container/src/main/resources/templates/registration.html
@@ -13,8 +13,6 @@
         <div class="brand">
             <a th:href="@{/start.mvc}" class="logo"><span>Web</span>Goat</a>
         </div>
-        <div class="toggle-navigation toggle-left">
-        </div>
         <div class="lessonTitle">
         </div>