From 2c9c0762130b5d1d33231c085239469fcaf705b0 Mon Sep 17 00:00:00 2001 From: Felix Hamann Date: Fri, 22 Jun 2018 23:40:34 +0200 Subject: [PATCH 01/16] started moving first lvl navi to top --- src/Foundation.hs | 6 +++--- static/css/icons.css | 7 +++++++ templates/widgets/asidenav.hamlet | 11 ---------- templates/widgets/navbar.hamlet | 26 ++++++++++++++++------- templates/widgets/navbar.lucius | 34 +++++++++++++++---------------- 5 files changed, 46 insertions(+), 38 deletions(-) diff --git a/src/Foundation.hs b/src/Foundation.hs index ffb4ba86d..fd3c99fb2 100644 --- a/src/Foundation.hs +++ b/src/Foundation.hs @@ -688,20 +688,20 @@ defaultLinks = -- Define the menu items of the header. , menuItemAccessCallback' = isJust <$> maybeAuthPair } , NavbarAside $ MenuItem - { menuItemLabel = "Veranstaltungen" + { menuItemLabel = "Kurse" , menuItemIcon = Just "book" , menuItemRoute = CourseListR -- should be CourseListActiveR or similar in the future , menuItemAccessCallback' = return True } , NavbarAside $ MenuItem { menuItemLabel = "Semester" - , menuItemIcon = Nothing + , menuItemIcon = Just "education" , menuItemRoute = TermShowR , menuItemAccessCallback' = return True } , NavbarAside $ MenuItem { menuItemLabel = "Benutzer" - , menuItemIcon = Just "user" + , menuItemIcon = Just "group" , menuItemRoute = UsersR , menuItemAccessCallback' = return True -- Creates a LOOP: (Authorized ==) <$> isAuthorized UsersR False } diff --git a/static/css/icons.css b/static/css/icons.css index e5fdd191d..b92b25f65 100644 --- a/static/css/icons.css +++ b/static/css/icons.css @@ -26,6 +26,13 @@ .glyphicon--user::before { content: '\e008'; } +.glyphicon--group::before { + /* TODO: get updated glyphicons for group-icon */ + content: '\e284'; +} +.glyphicon--education::before { + content: '\e233'; +} .glyphicon--login::before { content: '\e161'; } diff --git a/templates/widgets/asidenav.hamlet b/templates/widgets/asidenav.hamlet index a3994f85e..02bc66510 100644 --- a/templates/widgets/asidenav.hamlet +++ b/templates/widgets/asidenav.hamlet @@ -1,17 +1,6 @@ $newline never