diff --git a/config/keter.yml b/config/keter.yml index 3b8c9db84..2df90a924 120000 --- a/config/keter.yml +++ b/config/keter.yml @@ -1 +1 @@ -keter_testworx.yml \ No newline at end of file +keter_uni2work.yml \ No newline at end of file diff --git a/src/Foundation.hs b/src/Foundation.hs index aa2553952..a2af8b7ec 100644 --- a/src/Foundation.hs +++ b/src/Foundation.hs @@ -636,18 +636,18 @@ defaultLinks = -- Define the menu items of the header. , menuItemRoute = HomeR , menuItemAccessCallback' = return True } - , NavbarRight $ MenuItem - { menuItemLabel = "Profile" - , menuItemIcon = Just "cogs" - , menuItemRoute = ProfileR - , menuItemAccessCallback' = isJust <$> maybeAuthPair - } , NavbarRight $ MenuItem { menuItemLabel = "Impressum" , menuItemIcon = Just "book" , menuItemRoute = VersionR , menuItemAccessCallback' = return True } + , NavbarRight $ MenuItem + { menuItemLabel = "Profile" + , menuItemIcon = Just "cogs" + , menuItemRoute = ProfileR + , menuItemAccessCallback' = isJust <$> maybeAuthPair + } , NavbarSecondary $ MenuItem { menuItemLabel = "Login" , menuItemIcon = Just "sign-in-alt" diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs index 1d5e19fe2..dcc595626 100644 --- a/src/Handler/Sheet.hs +++ b/src/Handler/Sheet.hs @@ -221,6 +221,11 @@ getSShowR tid csh shn = do [ sortable (Just "type") "Typ" $ \(_,_, E.Value ftype) -> stringCell ftype , sortable (Just "path") "Dateiname" $ anchorCell (\(E.Value fName,_,E.Value fType) -> CSheetR tid csh shn (SFileR fType fName)) (\(E.Value fName,_,_) -> str2widget fName) + , sortable Nothing "Freigabe" $ \(_,_, E.Value ftype) -> + case ftype of + SheetExercise -> textCell $ display $ sheetActiveFrom sheet + SheetHint -> textCell $ display $ sheetHintFrom sheet + SheetSolution -> textCell $ display $ sheetSolutionFrom sheet , sortable (Just "time") "Modifikation" $ \(_,E.Value modified,_) -> stringCell $ formatTimeGerWDT (modified :: UTCTime) ] fileTable <- dbTable def $ DBTable