diff --git a/src/Foundation.hs b/src/Foundation.hs index 123ca4cff..32ae21e7e 100644 --- a/src/Foundation.hs +++ b/src/Foundation.hs @@ -88,9 +88,9 @@ data MenuItem = MenuItem } data MenuTypes - = NavbarLeft { menuItem :: MenuItem } - | NavbarRight { menuItem :: MenuItem } - | NavbarExtra { menuItem :: MenuItem } + = NavbarAside { menuItem :: MenuItem } + | NavbarRight { menuItem :: MenuItem } + | NavbarExtra { menuItem :: MenuItem } | NavbarSecondary { menuItem :: MenuItem } -- | A convenient synonym for creating forms. @@ -285,21 +285,9 @@ defaultLinks = -- Define the menu items of the header. , menuItemRoute = HomeR , menuItemAccessCallback = return True } - , NavbarLeft $ MenuItem - { menuItemLabel = "Kurse" - , menuItemIcon = Just "book" - , menuItemRoute = CourseListR - , menuItemAccessCallback = return True - } - , NavbarLeft $ MenuItem - { menuItemLabel = "Users" - , menuItemIcon = Just "user" - , menuItemRoute = UsersR - , menuItemAccessCallback = return True -- Creates a LOOP: (Authorized ==) <$> isAuthorized UsersR False - } , NavbarRight $ MenuItem { menuItemLabel = "Profile" - , menuItemIcon = Just "user" + , menuItemIcon = Just "profile" , menuItemRoute = ProfileR , menuItemAccessCallback = isJust <$> maybeAuthPair } @@ -315,6 +303,30 @@ defaultLinks = -- Define the menu items of the header. , menuItemRoute = AuthR LogoutR , menuItemAccessCallback = isJust <$> maybeAuthPair } + , NavbarAside $ MenuItem + { menuItemLabel = "Aktuelle Veranstaltungen" + , menuItemIcon = Just "book" + , menuItemRoute = CourseListR -- should be CourseListActiveR or similar in the future + , menuItemAccessCallback = return True + } + , NavbarAside $ MenuItem + { menuItemLabel = "Alte Veranstaltungen" + , menuItemIcon = Just "book" + , menuItemRoute = CourseListR -- should be CourseListInactiveR or similar in the future + , menuItemAccessCallback = return True + } + , NavbarAside $ MenuItem + { menuItemLabel = "Veranstaltungen" + , menuItemIcon = Just "book" + , menuItemRoute = CourseListR + , menuItemAccessCallback = return True + } + , NavbarAside $ MenuItem + { menuItemLabel = "Benutzer" + , menuItemIcon = Just "user" + , menuItemRoute = UsersR + , menuItemAccessCallback = return True -- Creates a LOOP: (Authorized ==) <$> isAuthorized UsersR False + } ] defaultLinkLayout :: [MenuTypes] -> Widget -> Handler Html diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs index 75767a26a..fc5e9c204 100644 --- a/src/Handler/Course.hs +++ b/src/Handler/Course.hs @@ -64,7 +64,7 @@ getCourseListTermR tidini = do ) ] let pageLinks = - [ NavbarLeft $ MenuItem + [ NavbarAside $ MenuItem { menuItemLabel = "Neuer Kurs" , menuItemIcon = Just "book" , menuItemRoute = CourseEditR diff --git a/static/css/icons.css b/static/css/icons.css index 43753b4d0..44c464f8f 100644 --- a/static/css/icons.css +++ b/static/css/icons.css @@ -19,6 +19,9 @@ .glyphicon--book::before { content: '\e043'; } +.glyphicon--profile::before { + content: '\e019'; +} .glyphicon--user::before { content: '\e008'; } diff --git a/templates/widgets/asidenav.hamlet b/templates/widgets/asidenav.hamlet index 43c52c45b..6de2b5f82 100644 --- a/templates/widgets/asidenav.hamlet +++ b/templates/widgets/asidenav.hamlet @@ -4,7 +4,7 @@