From 49e34e7678896e54ab5f27cfb35f956f9554da7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Pe=CC=81rez=20Crespo?= <jaime.perez@uninett.no>
Date: Thu, 29 Nov 2018 15:36:52 +0100
Subject: [PATCH] Fix the side menu.
---
src/js/bundle.js | 7 +++++
templates/_header.twig | 3 +-
www/assets/js/src/language.js | 17 ------------
www/assets/js/src/side_menu.js | 50 ----------------------------------
4 files changed, 8 insertions(+), 69 deletions(-)
delete mode 100644 www/assets/js/src/language.js
delete mode 100644 www/assets/js/src/side_menu.js
diff --git a/src/js/bundle.js b/src/js/bundle.js
index dce1b076c..2710a3368 100644
--- a/src/js/bundle.js
+++ b/src/js/bundle.js
@@ -16,4 +16,11 @@ $(document).ready(function () {
}
},
});
+
+ // side menu
+ $('#menuLink').click(function (e) {
+ e.preventDefault();
+ $('#layout').toggleClass('active');
+ $(this).toggleClass('active');
+ });
});
\ No newline at end of file
diff --git a/templates/_header.twig b/templates/_header.twig
index 1359659c4..ac0a21c8a 100644
--- a/templates/_header.twig
+++ b/templates/_header.twig
@@ -19,8 +19,7 @@
</div>
{% if not hideLanguageBar -%}
<div class="right">
- <a href="#menu" id="menuLink" class="menu-link hide-for-large">
- <!-- Hamburger icon -->
+ <a href="" id="menuLink" class="menu-link hide-for-large">
<span class="fa fa-language fa-2x" aria-hidden="true"></span>
</a>
</div>
diff --git a/www/assets/js/src/language.js b/www/assets/js/src/language.js
deleted file mode 100644
index 0f4484728..000000000
--- a/www/assets/js/src/language.js
+++ /dev/null
@@ -1,17 +0,0 @@
-
-$(document).ready(function () {
- // get available languages
- var languages = $.map($('#language_selector option') ,function (option) {
- return option.text.toLowerCase();
- });
-
- $('#SelectLang').on("change", function (e) {
- if (-1 !== $.inArray(
- $('#language_selector-selectized').prev().text().toLowerCase(),
- languages
- )) {
- e.currentTarget.submit();
- }
- });
-
-});
diff --git a/www/assets/js/src/side_menu.js b/www/assets/js/src/side_menu.js
deleted file mode 100644
index ef8194643..000000000
--- a/www/assets/js/src/side_menu.js
+++ /dev/null
@@ -1,50 +0,0 @@
-(function (window, document) {
-
- var layout = document.getElementById('layout'),
- menu = document.getElementById('menu'),
- menuLink = document.getElementById('menuLink'),
- content = document.getElementById('content');
- footer = document.getElementById('foot');
-
- function toggleClass(element, className)
- {
- var classes = element.className.split(/\s+/),
- length = classes.length,
- i = 0;
-
- for (; i < length; i++) {
- if (classes[i] === className) {
- classes.splice(i, 1);
- break;
- }
- }
- // The className is not found
- if (length === classes.length) {
- classes.push(className);
- }
-
- element.className = classes.join(' ');
- }
-
- function toggleAll(e)
- {
- var active = 'active';
-
- e.preventDefault();
- toggleClass(layout, active);
- toggleClass(menu, active);
- toggleClass(menuLink, active);
- toggleClass(footer, active);
- }
-
- menuLink.onclick = function (e) {
- toggleAll(e);
- };
-
- content.onclick = function (e) {
- if (menu.className.indexOf('active') !== -1) {
- toggleAll(e);
- }
- };
-
-}(this, this.document));
--
GitLab