From a88bf36f0e96eabcca9c007d32de4f89b73e06c8 Mon Sep 17 00:00:00 2001 From: Felix Hamann Date: Wed, 13 Feb 2019 21:17:47 +0100 Subject: [PATCH] move asidenav julius and lucius to static --- src/Foundation.hs | 6 +++-- .../css/utils/asidenav.scss | 0 static/js/utils/asidenav.js | 22 ++++++++++++++++++ templates/widgets/asidenav.julius | 23 ------------------- .../widgets/{ => asidenav}/asidenav.hamlet | 0 templates/widgets/asidenav/asidenav.julius | 4 ++++ 6 files changed, 30 insertions(+), 25 deletions(-) rename templates/widgets/asidenav.lucius => static/css/utils/asidenav.scss (100%) create mode 100644 static/js/utils/asidenav.js delete mode 100644 templates/widgets/asidenav.julius rename templates/widgets/{ => asidenav}/asidenav.hamlet (100%) create mode 100644 templates/widgets/asidenav/asidenav.julius diff --git a/src/Foundation.hs b/src/Foundation.hs index b2dd63906..b6d6ad212 100644 --- a/src/Foundation.hs +++ b/src/Foundation.hs @@ -971,7 +971,7 @@ siteLayout' headingOverride widget = do navbar :: Widget navbar = $(widgetFile "widgets/navbar") asidenav :: Widget - asidenav = $(widgetFile "widgets/asidenav") + asidenav = $(widgetFile "widgets/asidenav/asidenav") footer :: Widget footer = $(widgetFile "widgets/footer") alerts :: Widget @@ -996,11 +996,13 @@ siteLayout' headingOverride widget = do addScript $ StaticR js_utils_featureChecker_js addScript $ StaticR js_utils_tabber_js addScript $ StaticR js_utils_alerts_js + addScript $ StaticR js_utils_asidenav_js addStylesheet $ StaticR css_vendor_flatpickr_css addStylesheet $ StaticR css_vendor_fontawesome_css addStylesheet $ StaticR css_fonts_css - addStylesheet $ StaticR css_utils_tabber_css + addStylesheet $ StaticR css_utils_tabber_scss addStylesheet $ StaticR css_utils_alerts_scss + addStylesheet $ StaticR css_utils_asidenav_scss $(widgetFile "default-layout") $(widgetFile "standalone/modal") $(widgetFile "standalone/showHide") diff --git a/templates/widgets/asidenav.lucius b/static/css/utils/asidenav.scss similarity index 100% rename from templates/widgets/asidenav.lucius rename to static/css/utils/asidenav.scss diff --git a/static/js/utils/asidenav.js b/static/js/utils/asidenav.js new file mode 100644 index 000000000..8b16fb4b6 --- /dev/null +++ b/static/js/utils/asidenav.js @@ -0,0 +1,22 @@ +(function() { + 'use strict'; + + window.utils = window.utils || {}; + + var FAVORITES_BTN_CLASS = 'navbar__list-item--favorite'; + var FAVORITES_BTN_ACTIVE_CLASS = 'navbar__list-item--active'; + var ASIDENAV_EXPANDED_CLASS = 'main__aside--expanded'; + + window.utils.aside = function(asideEl) { + + function init() { + var favoritesBtn = document.querySelector('.' + FAVORITES_BTN_CLASS); + favoritesBtn.addEventListener('click', function(event) { + favoritesBtn.classList.toggle(FAVORITES_BTN_ACTIVE_CLASS); + asideEl.classList.toggle(ASIDENAV_EXPANDED_CLASS); + event.preventDefault(); + }, true); + } + init(); + }; +})(); diff --git a/templates/widgets/asidenav.julius b/templates/widgets/asidenav.julius deleted file mode 100644 index 238ca1f58..000000000 --- a/templates/widgets/asidenav.julius +++ /dev/null @@ -1,23 +0,0 @@ -(function() { - 'use strict'; - - window.utils = window.utils || {}; - - window.utils.aside = function(asideEl) { - - function init() { - var favoritesBtn = document.querySelector('.navbar__list-item--favorite'); - favoritesBtn.addEventListener('click', function(event) { - favoritesBtn.classList.toggle('navbar__list-item--active'); - asideEl.classList.toggle('main__aside--expanded'); - event.preventDefault(); - }, true); - } - init(); - }; -})(); - -document.addEventListener('DOMContentLoaded', function() { - var asidenavEl = document.querySelector('.main__aside'); - window.utils.aside(asidenavEl); -}); diff --git a/templates/widgets/asidenav.hamlet b/templates/widgets/asidenav/asidenav.hamlet similarity index 100% rename from templates/widgets/asidenav.hamlet rename to templates/widgets/asidenav/asidenav.hamlet diff --git a/templates/widgets/asidenav/asidenav.julius b/templates/widgets/asidenav/asidenav.julius new file mode 100644 index 000000000..9f6e9ba37 --- /dev/null +++ b/templates/widgets/asidenav/asidenav.julius @@ -0,0 +1,4 @@ +document.addEventListener('DOMContentLoaded', function() { + var asidenavEl = document.querySelector('.main__aside'); + window.utils.aside(asidenavEl); +});