Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX

src/Handler/Sheet.hs

@@ -221,7 +221,7 @@ 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.
+    , dbtFilter = Map.empty
     , dbtIdent = "files" :: Text
     -- TODO: Add column for and visibility date
     , dbtSorting = [ ( "type"

src/Handler/Utils/Form.hs

@@ -366,7 +366,7 @@ utcTimeField = Field
   where
     fieldTimeFormat :: String
     --fieldTimeFormat = "%e.%m.%y %k:%M"
-    fieldTimeFormat = "%Y-%m-%eT%H:%M"
+    fieldTimeFormat = "%Y-%m-%dT%H:%M"
 
     readTime :: Text -> Either FormMessage UTCTime
     readTime t =

src/Utils.hs

@@ -99,8 +99,6 @@ instance DisplayAble Text where
 instance DisplayAble String where
   display = pack
 
-
-
 instance DisplayAble a => DisplayAble (Maybe a) where
   display Nothing  = ""
   display (Just x) = display x

templates/widgets/asidenav.hamlet

@@ -17,7 +17,6 @@ $newline never
         WiSe 17/18
       <ul .asidenav__list>
         $forall (Course{..}, courseRoute, pageActions) <- favourites
-          $# TODO: this list-item should also be marked as active if one of its children is shown
           <li .asidenav__list-item :highlight courseRoute:.asidenav__list-item--active>
             <a .asidenav__link-wrapper href=@{courseRoute}>
               <div .asidenav__link-shorthand>#{courseShorthand}

templates/widgets/asidenav.lucius

@@ -169,9 +169,6 @@
     .asidenav__link-shorthand {
       display: flex;
       position: static;
-      // TODO: make shorthands in collapsed beautiful *.*
-      // background-color: var(--color-dark);
-      // color: var(--color-lightwhite);
       height: 50px;
       width: 50px;
       text-align: center;

templates/widgets/form.hamlet

@@ -7,7 +7,6 @@ $case formLayout
         $if not (Blaze.null $ fvLabel view)
           <label .form-group__label for=#{fvId view}>#{fvLabel view}
         $# TODO: inputs should have proper placeholders
-        $# TODO: can we wrap checkboxes in a <div.checkbox> and radio buttons in a <div.radio>?
         <div .form-group__input>
           $# FIXME: file-input does not have `required` attribute, although set on form-group
           ^{fvInput view}