From 0ba866ec2952abd20f9eb5cf78739972f797603b Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 29 Jun 2020 08:13:53 +0200 Subject: [PATCH 1/2] Fixes --- skolehjem/resources/js/navmenu/menu.js | 24 +++++++++---------- .../views/admin/layout/base.blade.php | 2 +- .../washing-reservations/index.blade.php | 4 ++-- .../resources/views/app/layout/base.blade.php | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/skolehjem/resources/js/navmenu/menu.js b/skolehjem/resources/js/navmenu/menu.js index 08393c8..9a3e8d9 100644 --- a/skolehjem/resources/js/navmenu/menu.js +++ b/skolehjem/resources/js/navmenu/menu.js @@ -1,13 +1,3 @@ -// document.addEventListener("DOMContentLoaded", function(){ -// // Handler when the DOM is fully loaded -// var path = window.location.pathname; -// -// if(path === "/menuplans" || path === "/vagttelefon" || path === "/") -// { -// document.getElementById ('toggle').addEventListener ('click', toggleMenu, false); -// } -// }); -// // function toggleMenu() { // var buttonElement = document.getElementById('menuIcon'); // @@ -39,11 +29,21 @@ function toggleMenu(menu) { let menuElement = document.getElementById(menu); + let logoElement = document.getElementById("sdeLogo"); + let htmlElement = document.getElementsByTagName('html')[0]; + let mainElement = document.getElementsByTagName('main')[0]; - if(menuElement.classList.contains("hide")) + if(menuElement.classList.contains("hide")) { menuElement.classList.remove("hide"); - else + mainElement.classList.remove("d-none"); + htmlElement.style.backgroundColor = 'rgb(255, 255, 255)'; + logoElement.src = '/images/logos/Logo-normal.svg'; + } else { menuElement.classList.add("hide"); + mainElement.classList.add("d-none"); + htmlElement.style.backgroundColor = 'rgb(0, 120, 138)'; + logoElement.src = '/images/logos/Logo-hvid.svg'; + } } module.exports = { diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php index b7564de..67cf268 100644 --- a/skolehjem/resources/views/admin/layout/base.blade.php +++ b/skolehjem/resources/views/admin/layout/base.blade.php @@ -34,7 +34,7 @@ ReadVis Vaskemaskiner
- ReadVaske Reservationer + ReadVis Vaskemaskine Reservationer
CreateOpret Vaskemaskine diff --git a/skolehjem/resources/views/admin/washing-reservations/index.blade.php b/skolehjem/resources/views/admin/washing-reservations/index.blade.php index 251ea53..2d204c0 100644 --- a/skolehjem/resources/views/admin/washing-reservations/index.blade.php +++ b/skolehjem/resources/views/admin/washing-reservations/index.blade.php @@ -2,11 +2,11 @@ @extends("admin.layout.header") @section("title") - Booking - Vis + Vaskemaskine Reservationer - Vis @endsection @section("path") - Vis Booking / + Vis Vaskemaskine Reservationer / @endsection @section("content") diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php index 49543f6..0b5e47a 100644 --- a/skolehjem/resources/views/app/layout/base.blade.php +++ b/skolehjem/resources/views/app/layout/base.blade.php @@ -36,7 +36,7 @@ Kontoret Kontoret - + Vagttelefon Vagttelefon From b790d2cf65412fdec0caa5926694f35e2d46551f Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 29 Jun 2020 08:15:11 +0200 Subject: [PATCH 2/2] Fixes --- skolehjem/resources/views/app/layout/base.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php index 0b5e47a..49543f6 100644 --- a/skolehjem/resources/views/app/layout/base.blade.php +++ b/skolehjem/resources/views/app/layout/base.blade.php @@ -36,7 +36,7 @@ Kontoret Kontoret - + Vagttelefon Vagttelefon