diff --git a/src/Foundation.hs b/src/Foundation.hs index 08ee410b6..02672d94f 100644 --- a/src/Foundation.hs +++ b/src/Foundation.hs @@ -440,6 +440,10 @@ instance Yesod UniWorX where courseRoute = CourseR courseTerm courseShorthand CShowR in (c, courseRoute, ) <$> filterM (menuItemAccessCallback . menuItem) (pageActions courseRoute) + -- TODO: Lookup theme in Cookie/DB and set variable accordingly + -- let currentTheme = "theme--default" + let currentTheme = "theme--aberdeen-reds" :: Text + -- We break up the default layout into two components: -- default-layout is the contents of the body tag, and -- default-layout-wrapper is the entire page. Since the final diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs index 997703a1e..54617fa19 100644 --- a/src/Handler/Sheet.hs +++ b/src/Handler/Sheet.hs @@ -36,6 +36,7 @@ import Control.Monad.Writer (MonadWriter(..), execWriterT) import Network.Mime import qualified Data.Set as Set +import qualified Data.Map as Map instance Eq (Unique Sheet) where @@ -92,7 +93,7 @@ makeSheetForm msId template = identForm FIDsheet $ \html -> do <*> aopt utcTimeField (fsb "Lösung ab") (sfSolutionFrom <$> template) <*> fileAFormOpt (fsb "Lösung") <*> formToAForm (correctorForm msId (maybe [] sfCorrectors template)) - -- <* submitButton + <* submitButton return $ case result of FormSuccess sheetResult | errorMsgs <- validateSheet sheetResult @@ -220,7 +221,9 @@ getSShowR tid csh shn = do { dbtSQLQuery = fileData , dbtColonnade = colonnadeFiles , dbtAttrs = tableDefault + -- , dbtFilter = Map.empty -- TODO: Just for Testing. Gregor needs to explain what is needed here. , dbtIdent = "files" :: Text + -- TODO: Add column for and visibility date , dbtSorting = [ ( "type" , SortColumn $ \(sheet `E.InnerJoin` sheetFile `E.InnerJoin` file) -> sheetFile E.^. SheetFileType ) diff --git a/templates/default-layout-wrapper.hamlet b/templates/default-layout-wrapper.hamlet index ef15995c0..4eb2fd2c0 100644 --- a/templates/default-layout-wrapper.hamlet +++ b/templates/default-layout-wrapper.hamlet @@ -39,7 +39,7 @@ $newline never } - +