From cf8207f1c6d55971150998b442b14ceecd08cc54 Mon Sep 17 00:00:00 2001 From: SJost Date: Sat, 16 Feb 2019 10:44:14 +0100 Subject: [PATCH] Swap icon Term<->Courses due to future Calendar replacement for Term --- src/Foundation.hs | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Foundation.hs b/src/Foundation.hs index 561a2c5ef..05f50b22c 100644 --- a/src/Foundation.hs +++ b/src/Foundation.hs @@ -1109,9 +1109,9 @@ submissionList tid csh shn uid = E.select . E.from $ \(course `E.InnerJoin` shee defaultLinks :: (MonadHandler m, HandlerSite m ~ UniWorX) => m [MenuItem] defaultLinks = fmap catMaybes . mapM runMaybeT $ -- Define the menu items of the header. [ return MenuItem - { menuItemType = NavbarAside + { menuItemType = NavbarAside , menuItemLabel = MsgMenuHome - , menuItemIcon = Just "home" + , menuItemIcon = Just "home" , menuItemRoute = SomeRoute HomeR , menuItemModal = False , menuItemAccessCallback' = return True @@ -1128,7 +1128,7 @@ defaultLinks = fmap catMaybes . mapM runMaybeT $ -- Define the menu items of the mCurrentRoute <- getCurrentRoute return MenuItem - { menuItemType = NavbarRight + { menuItemType = NavbarRight , menuItemLabel = MsgMenuHelp , menuItemIcon = Just "question" , menuItemRoute = SomeRoute (HelpR, catMaybes [(toPathPiece GetReferer, ) . toPathPiece <$> mCurrentRoute]) @@ -1136,57 +1136,57 @@ defaultLinks = fmap catMaybes . mapM runMaybeT $ -- Define the menu items of the , menuItemAccessCallback' = return True } , return MenuItem - { menuItemType = NavbarRight + { menuItemType = NavbarRight , menuItemLabel = MsgMenuProfile - , menuItemIcon = Just "cogs" + , menuItemIcon = Just "cogs" , menuItemRoute = SomeRoute ProfileR , menuItemModal = False , menuItemAccessCallback' = isJust <$> maybeAuthPair } , return MenuItem - { menuItemType = NavbarSecondary + { menuItemType = NavbarSecondary , menuItemLabel = MsgMenuLogin - , menuItemIcon = Just "sign-in-alt" + , menuItemIcon = Just "sign-in-alt" , menuItemRoute = SomeRoute $ AuthR LoginR , menuItemModal = True , menuItemAccessCallback' = isNothing <$> maybeAuthPair } , return MenuItem - { menuItemType = NavbarSecondary + { menuItemType = NavbarSecondary , menuItemLabel = MsgMenuLogout - , menuItemIcon = Just "sign-out-alt" + , menuItemIcon = Just "sign-out-alt" , menuItemRoute = SomeRoute $ AuthR LogoutR , menuItemModal = False , menuItemAccessCallback' = isJust <$> maybeAuthPair } , return MenuItem - { menuItemType = NavbarAside + { menuItemType = NavbarAside , menuItemLabel = MsgMenuCourseList - , menuItemIcon = Just "calendar-alt" + , menuItemIcon = Just "graduation-cap" , menuItemRoute = SomeRoute CourseListR , menuItemModal = False , menuItemAccessCallback' = return True } , return MenuItem - { menuItemType = NavbarAside + { menuItemType = NavbarAside , menuItemLabel = MsgMenuTermShow - , menuItemIcon = Just "graduation-cap" + , menuItemIcon = Just "calendar-alt" -- SJ wrote: calendar icon, since Term will be repleaced with TimeTable in the future; arguably Term is more calendar-like than courses anyway!!! , menuItemRoute = SomeRoute TermShowR , menuItemModal = False , menuItemAccessCallback' = return True } , return MenuItem - { menuItemType = NavbarAside + { menuItemType = NavbarAside , menuItemLabel = MsgMenuCorrections - , menuItemIcon = Just "check" + , menuItemIcon = Just "check" , menuItemRoute = SomeRoute CorrectionsR , menuItemModal = False , menuItemAccessCallback' = return True } , return MenuItem - { menuItemType = NavbarAside + { menuItemType = NavbarAside , menuItemLabel = MsgMenuUsers - , menuItemIcon = Just "users" + , menuItemIcon = Just "users" , menuItemRoute = SomeRoute UsersR , menuItemModal = False , menuItemAccessCallback' = return True -- Creates a LOOP: (Authorized ==) <$> isAuthorized UsersR False