From 5ecb39da9d63bc0d90185d9f6e4311fbaf98c821 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 10 Feb 2019 20:08:29 +0100
Subject: [PATCH 01/17] frontend preparation for form sections

---
 templates/standalone/inputs.lucius | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/templates/standalone/inputs.lucius b/templates/standalone/inputs.lucius
index 3b0d11372..ba899f066 100644
--- a/templates/standalone/inputs.lucius
+++ b/templates/standalone/inputs.lucius
@@ -13,8 +13,16 @@
   border-left: 2px solid transparent;
 
   + .form-group {
-    margin-top: 13px;
+    margin-top: 7px;
   }
+
+  + .form-group-title {
+    margin-top: 40px;
+  }
+}
+
+.form-group-title {
+  color: var(--color-fontsec);
 }
 
 .form-group__label {
@@ -22,6 +30,10 @@
   padding-top: 6px;
 }
 
+.form-group__hint {
+  color: var(--color-fontsec);
+}
+
 .form-group--required {
 
   .form-group__label::after {

From 64482ff8706f942478ce38781be1f1a718fe0b76 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 10 Feb 2019 21:24:29 +0100
Subject: [PATCH 02/17] show form group tooltips as hint instead of tooltip

---
 templates/standalone/inputs.lucius | 1 +
 templates/widgets/form.hamlet      | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/templates/standalone/inputs.lucius b/templates/standalone/inputs.lucius
index ba899f066..9d5fb2b79 100644
--- a/templates/standalone/inputs.lucius
+++ b/templates/standalone/inputs.lucius
@@ -32,6 +32,7 @@
 
 .form-group__hint {
   color: var(--color-fontsec);
+  font-size: 0.9rem;
 }
 
 .form-group--required {
diff --git a/templates/widgets/form.hamlet b/templates/widgets/form.hamlet
index 06578df77..08d37adfc 100644
--- a/templates/widgets/form.hamlet
+++ b/templates/widgets/form.hamlet
@@ -12,9 +12,7 @@ $case formLayout
         $if not (Blaze.null $ fvLabel view)
           <label .form-group__label for=#{fvId view}>
             #{fvLabel view}
-            $maybe tooltip <- fvTooltip view
-              <div .js-tooltip>
-                <div .tooltip__handle>
-                <div .tooltip__content>^{tooltip}
+            $maybe hint <- fvTooltip view
+              <div .form-group__hint>^{hint}
         <div .form-group__input>
           ^{fvInput view}

From 7ad95e73282fb95841dcafcaed124042ae98117c Mon Sep 17 00:00:00 2001
From: SJost <jost@tcs.ifi.lmu.de>
Date: Sat, 16 Feb 2019 14:32:33 +0100
Subject: [PATCH 03/17] MFormGroups okay, AFormGroups just a silly workaround

---
 src/Handler/Profile.hs               | 19 +++++++++-----
 src/Handler/Utils/Form.hs            | 35 +++++++++++++++++++++++++
 src/Utils/Form.hs                    |  4 +++
 src/Utils/TH.hs                      | 39 ++++++++++++++++++++--------
 templates/widgets/aform-group.hamlet |  8 ++++++
 templates/widgets/form-group.hamlet  |  4 +++
 6 files changed, 91 insertions(+), 18 deletions(-)
 create mode 100644 templates/widgets/aform-group.hamlet
 create mode 100644 templates/widgets/form-group.hamlet

diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs
index 38f064dd8..3bd2e0166 100644
--- a/src/Handler/Profile.hs
+++ b/src/Handler/Profile.hs
@@ -28,8 +28,16 @@ data SettingsForm = SettingsForm
 
 makeSettingForm :: Maybe SettingsForm -> Form SettingsForm
 makeSettingForm template = identForm FIDsettings $ \html -> do
-    let themeList = [Option (display t) t (toPathPiece t) | t <- universeF]
-    (result, widget) <- flip (renderAForm FormStandard) html $ SettingsForm
+    (result, widget) <- flip (renderAForm FormStandard) html $ settingsFormT5T2
+      <$> aFormGroup "Cosmetics"     cosmeticsForm
+      <*> aFormGroup "Notifications" notificationsForm
+      <*  submitButton
+    return (result, widget) -- no validation required here
+  where
+    settingsFormT5T2 :: (Int,Theme,DateTimeFormat,DateTimeFormat,DateTimeFormat) -> (Bool,NotificationSettings) -> SettingsForm
+    settingsFormT5T2 = $(uncurryN 2) . $(uncurryN 5) SettingsForm
+    themeList = [Option (display t) t (toPathPiece t) | t <- universeF]
+    cosmeticsForm = do (,,,,)
       <$> areq (natFieldI $ MsgNatField "Favoriten") -- TODO: natFieldI not working here
             (fslpI MsgFavoriten "Anzahl Favoriten") (stgMaxFavourties <$> template)
       <*> areq (selectField . return $ mkOptionList themeList)
@@ -37,16 +45,13 @@ makeSettingForm template = identForm FIDsettings $ \html -> do
       <*> areq (selectField $ dateTimeFormatOptions SelFormatDateTime) (fslI MsgDateTimeFormat) (stgDateTime <$> template)
       <*> areq (selectField $ dateTimeFormatOptions SelFormatDate) (fslI MsgDateFormat) (stgDate <$> template)
       <*> areq (selectField $ dateTimeFormatOptions SelFormatTime) (fslI MsgTimeFormat) (stgTime <$> template)
-      <*> areq checkBoxField (fslI MsgDownloadFiles
+    notificationsForm = (,)
+      <$> areq checkBoxField (fslI MsgDownloadFiles
                                & setTooltip MsgDownloadFilesTip
                              ) (stgDownloadFiles <$> template)
       <*> (NotificationSettings <$> funcForm nsForm (fslI MsgNotificationSettings) True)
-      <*  submitButton
-    return (result, widget) -- no validation required here
-  where
     nsForm nt = fromMaybe False <$> aopt checkBoxField (fslI nt) (Just $ flip notificationAllowed nt . stgNotificationSettings <$> template)
 
-
 getProfileR, postProfileR :: Handler Html
 getProfileR = postProfileR
 postProfileR = do
diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index 152d53186..286a7d451 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -39,6 +39,7 @@ import Control.Monad.Writer.Class
 import Data.Scientific (Scientific)
 import Data.Ratio
 import Text.Read (readMaybe)
+import Text.Blaze (ToMarkup)
 
 import Utils.Lens
 
@@ -630,3 +631,37 @@ formResultModal res finalDest handler = maybeT_ $ do
     | otherwise -> do
         forM_ messages $ \Message{..} -> addMessage messageClass messageContent
         redirect finalDest
+
+
+-- TODO / WIP: form groups, needs cleanup once it works
+infoField :: (Monad m, HandlerSite m ~ UniWorX, ToMarkup t) => t -> Field m () --TODO if kept, move to fields, more likely delete this workaround
+infoField txt = Field { fieldEnctype = UrlEncoded
+                      , fieldParse = const $ const $ return $ Right $ Just ()
+                      , fieldView  = \_theId _name _attrs _val _isReq ->
+                           [whamlet|#{txt}|]
+                      }
+
+infoForm :: Text -> Form () -- TODO: WIP, delete
+infoForm infoText csrf =
+  let widget = [whamlet|#{csrf}
+                <h3 .form-group-title>#{infoText}
+               |]
+  in  return (FormSuccess (), widget)
+
+aFormGroup :: (MonadHandler m, HandlerSite m ~ UniWorX) => String -> AForm m a -> AForm m a
+aFormGroup groupTitle innerForm =
+  -- THIS IS JUST A WORKAROUND, SERIOUS ATTEMPT COMMENTED OUT BELOW
+   grpHeader *> innerForm
+  where
+    emptyT :: Text
+    emptyT = ""
+    grpHeader = aopt (infoField emptyT) (fromString groupTitle) Nothing
+  -- -- attempt through double converision
+  -- where mInner = do
+  --   let (result, ($ []) -> fieldViews) = aFormToForm innerForm
+  --   return (result, $(widgetFile "widgets/aform-group"))
+
+formGroup :: Text -> Form a -> Form a
+formGroup groupTitle innerForm csrf = do
+  (result,fGroup) <- innerForm csrf
+  return (result,$(widgetFile "widgets/form-group"))
\ No newline at end of file
diff --git a/src/Utils/Form.hs b/src/Utils/Form.hs
index 6fab13a32..19e8e3cb8 100644
--- a/src/Utils/Form.hs
+++ b/src/Utils/Form.hs
@@ -5,6 +5,7 @@ module Utils.Form where
 import ClassyPrelude.Yesod hiding (addMessage, cons, Proxy(..))
 import Settings
 
+-- import Text.Blaze (toMarkup) -- for debugging
 import qualified Text.Blaze.Internal as Blaze (null)
 import qualified Data.Text as T
 
@@ -40,6 +41,9 @@ data FormLayout = FormStandard | FormDBTableFilter | FormDBTablePagesize
 
 renderAForm :: Monad m => FormLayout -> FormRender m a
 renderAForm formLayout aform fragment = do
+  -- let lab1 :: Text
+  --     lab1 = "LABEL"
+  -- let demo = [FieldView (toMarkup lab1) Nothing "someID" [whamlet|FIELD|] Nothing False]
   (res, ($ []) -> fieldViews) <- aFormToForm aform
   let widget = $(widgetFile "widgets/form")
   return (res, widget)
diff --git a/src/Utils/TH.hs b/src/Utils/TH.hs
index 501cfee12..ea1e73b3c 100644
--- a/src/Utils/TH.hs
+++ b/src/Utils/TH.hs
@@ -24,7 +24,7 @@ projNI n i = lamE [pat] rhs
   where pat = tupP (map varP xs)
         rhs = varE (xs !! (i - 1))
         xs  = [ mkName $ "x" ++ show j | j <- [1..n] ]
-        
+
 ---------------
 -- Functions --
 ---------------
@@ -34,21 +34,38 @@ permuteFun perm = lamE pat rhs
   where pat = map varP $ fn:xs
         rhs = foldl appE (varE fn) $ map varE ps
 --         rhs = appE (varE fn) (varE $ xs!!1)
-        ln  = length perm   
+        ln  = length perm
         xs  = [ mkName $ "x" ++ show j | j <- [1..ln] ]
         ps  = [ xs !! (j-1) | j <- perm ]
-        fn  = mkName "fn" 
+        fn  = mkName "fn"
 
 altFun :: [Int] -> ExpQ -- generic permutation/repetition of function arguments, i.e. $(permuteFun [2,1]) == flip
 altFun perm = lamE pat rhs
   where pat = map varP $ fn:xs
         rhs = foldl appE (varE fn) $ map varE ps
---         rhs = appE (varE fn) (varE $ xs!!1)        
+--         rhs = appE (varE fn) (varE $ xs!!1)
         mx  = maximum $ impureNonNull perm
         xs  = [ mkName $ "x" ++ show j | j <- [1..mx] ]
         ps  = [ xs !! (j-1) | j <- perm ]
-        fn  = mkName "fn" 
-        
+        fn  = mkName "fn"
+
+-- |
+curryN :: Int -> ExpQ
+curryN n = do
+  fn <- newName "foo"
+  xs <- replicateM n $ newName "x"
+  let pat = map VarP (fn:xs)
+  let tup = TupE (map VarE xs)
+  let rhs = AppE (VarE fn) tup
+  return $ LamE pat rhs
+
+uncurryN :: Int -> ExpQ
+uncurryN n = do
+  fn <- newName "foo"
+  xs <- replicateM n $ newName "x"
+  let pat = [VarP fn, TupP (map VarP xs)]
+  let rhs = foldl AppE (VarE fn) (map VarE xs)
+  return $ LamE pat rhs
 
 
 -- Special Show-Instances for Themes
@@ -105,10 +122,10 @@ embedRenderMessage f inner mangle = do
 
   f' <- newName "f"
   ls <- newName "ls"
-  
+
   pure <$> instanceD (cxt []) [t|RenderMessage $(conT f) $(conT inner)|]
     [ funD 'renderMessage
-      [ clause [varP f', varP ls] (normalB $ [e|renderMessage $(varE f') $(varE ls) . $(lamCaseE matches)|]) [] 
+      [ clause [varP f', varP ls] (normalB $ [e|renderMessage $(varE f') $(varE ls) . $(lamCaseE matches)|]) []
       ]
     ]
 
@@ -129,13 +146,13 @@ embedRenderMessageVariant f newT mangle = do
 
   f' <- newName "f"
   ls <- newName "ls"
-  
+
   pure <$> instanceD (cxt []) [t|RenderMessage $(conT f) $(conT newT)|]
     [ funD 'renderMessage
-      [ clause [varP f', varP ls] (normalB $ [e|renderMessage $(varE f') $(varE ls) . $(lamCaseE matches)|]) [] 
+      [ clause [varP f', varP ls] (normalB $ [e|renderMessage $(varE f') $(varE ls) . $(lamCaseE matches)|]) []
       ]
     ]
-  
+
 
 dispatchTH :: Name -- ^ Datatype to pattern match
            -> ExpQ
diff --git a/templates/widgets/aform-group.hamlet b/templates/widgets/aform-group.hamlet
new file mode 100644
index 000000000..4a868bd14
--- /dev/null
+++ b/templates/widgets/aform-group.hamlet
@@ -0,0 +1,8 @@
+$newline never
+<h3 .form-group-title>#{groupTitle} TODO
+<div .form-group>
+  $forall view <- fieldViews
+    <label .form-group__label for=#{fvId view}>
+      #{fvLabel view}
+    <div .form-group__input>
+      ^{fvInput view}
\ No newline at end of file
diff --git a/templates/widgets/form-group.hamlet b/templates/widgets/form-group.hamlet
new file mode 100644
index 000000000..ea9fb123e
--- /dev/null
+++ b/templates/widgets/form-group.hamlet
@@ -0,0 +1,4 @@
+$newline never
+<h3 .form-group-title>#{groupTitle} TODO
+<div .form-group>
+  ^{fGroup}
\ No newline at end of file

From 1cc9ca119f01bc396410e039ddbe5c9eada205cc Mon Sep 17 00:00:00 2001
From: SJost <jost@tcs.ifi.lmu.de>
Date: Sat, 16 Feb 2019 14:35:14 +0100
Subject: [PATCH 04/17] Fix build linter

---
 src/Handler/Profile.hs         | 2 +-
 src/Handler/Term.hs            | 4 ++--
 src/Handler/Utils/Templates.hs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs
index 3bd2e0166..f1e449216 100644
--- a/src/Handler/Profile.hs
+++ b/src/Handler/Profile.hs
@@ -37,7 +37,7 @@ makeSettingForm template = identForm FIDsettings $ \html -> do
     settingsFormT5T2 :: (Int,Theme,DateTimeFormat,DateTimeFormat,DateTimeFormat) -> (Bool,NotificationSettings) -> SettingsForm
     settingsFormT5T2 = $(uncurryN 2) . $(uncurryN 5) SettingsForm
     themeList = [Option (display t) t (toPathPiece t) | t <- universeF]
-    cosmeticsForm = do (,,,,)
+    cosmeticsForm = (,,,,)
       <$> areq (natFieldI $ MsgNatField "Favoriten") -- TODO: natFieldI not working here
             (fslpI MsgFavoriten "Anzahl Favoriten") (stgMaxFavourties <$> template)
       <*> areq (selectField . return $ mkOptionList themeList)
diff --git a/src/Handler/Term.hs b/src/Handler/Term.hs
index 0f9da91a8..b6ca6f622 100644
--- a/src/Handler/Term.hs
+++ b/src/Handler/Term.hs
@@ -148,13 +148,13 @@ getTermEditR = do
   mbLastTerm <- runDB $ selectFirst [] [Desc TermName]
   let template = case mbLastTerm of
         Nothing -> mempty
-        (Just (Entity { entityVal=Term{..} })) -> let
+        (Just Entity{ entityVal=Term{..}}) -> let
             ntid = succ termName
             seas = season ntid
             yr   = year   ntid
             yr'  = if seas == Summer then yr else succ yr
           in mempty
-              { tftName  = Just $ ntid
+              { tftName  = Just   ntid
               , tftStart = Just $ defaultDay True  seas & setYear yr
               , tftEnd   = Just $ defaultDay False seas & setYear yr'
               }
diff --git a/src/Handler/Utils/Templates.hs b/src/Handler/Utils/Templates.hs
index 221c72b76..c316d9b77 100644
--- a/src/Handler/Utils/Templates.hs
+++ b/src/Handler/Utils/Templates.hs
@@ -18,7 +18,7 @@ modal modalTrigger modalContent = do
         <a .modal__trigger href=#{route'} ##{triggerId}>
           <span .modal__trigger-label>^{modalTrigger}
       |]
-    Right _     -> do
+    Right _     ->
       [whamlet|
         $newline never
         <div .modal__trigger ##{triggerId}>

From 2490b0108139f3199da477bb181d6b49f80338e0 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 16 Feb 2019 14:45:22 +0100
Subject: [PATCH 05/17] little more space for form group hints

---
 templates/standalone/inputs.lucius | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/templates/standalone/inputs.lucius b/templates/standalone/inputs.lucius
index 9d5fb2b79..84214f862 100644
--- a/templates/standalone/inputs.lucius
+++ b/templates/standalone/inputs.lucius
@@ -16,12 +16,12 @@
     margin-top: 7px;
   }
 
-  + .form-group-title {
+  + .form-section-title {
     margin-top: 40px;
   }
 }
 
-.form-group-title {
+.form-section-title {
   color: var(--color-fontsec);
 }
 
@@ -31,6 +31,7 @@
 }
 
 .form-group__hint {
+  margin-top: 7px;
   color: var(--color-fontsec);
   font-size: 0.9rem;
 }

From 9287d89e33a62586682e74dbacc3dc35900e85a3 Mon Sep 17 00:00:00 2001
From: SJost <jost@tcs.ifi.lmu.de>
Date: Sat, 16 Feb 2019 16:17:33 +0100
Subject: [PATCH 06/17] FormGroup example on profile data page implemented

---
 src/Handler/Profile.hs    | 68 ++++++++++++++++++++++++++++-----------
 src/Handler/Utils/Form.hs | 16 ++++++++-
 2 files changed, 64 insertions(+), 20 deletions(-)

diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs
index f1e449216..2a5a69b91 100644
--- a/src/Handler/Profile.hs
+++ b/src/Handler/Profile.hs
@@ -28,29 +28,59 @@ data SettingsForm = SettingsForm
 
 makeSettingForm :: Maybe SettingsForm -> Form SettingsForm
 makeSettingForm template = identForm FIDsettings $ \html -> do
-    (result, widget) <- flip (renderAForm FormStandard) html $ settingsFormT5T2
-      <$> aFormGroup "Cosmetics"     cosmeticsForm
-      <*> aFormGroup "Notifications" notificationsForm
-      <*  submitButton
+    (result, widget) <- flip (renderAForm FormStandard) html $ SettingsForm
+        <$  aformSection cosmeticsSection
+        <*> areq (natFieldI $ MsgNatField "Favoriten") -- TODO: natFieldI not working here
+            (fslpI MsgFavoriten "Anzahl Favoriten") (stgMaxFavourties <$> template)
+        <*> areq (selectField . return $ mkOptionList themeList)
+            (fslI  MsgTheme) { fsId = Just "theme-select" } (stgTheme         <$> template)
+        <*> areq (selectField $ dateTimeFormatOptions SelFormatDateTime) (fslI MsgDateTimeFormat) (stgDateTime <$> template)
+        <*> areq (selectField $ dateTimeFormatOptions SelFormatDate) (fslI MsgDateFormat) (stgDate <$> template)
+        <*> areq (selectField $ dateTimeFormatOptions SelFormatTime) (fslI MsgTimeFormat) (stgTime <$> template)
+        <*  aformSection notificationSection
+        <*> areq checkBoxField (fslI MsgDownloadFiles
+                                   & setTooltip MsgDownloadFilesTip
+                                ) (stgDownloadFiles <$> template)
+        <*> (NotificationSettings <$> funcForm nsForm (fslI MsgNotificationSettings) True)
+    --   <$> aFormGroup "Cosmetics"     cosmeticsForm
+    --   <*> aFormGroup "Notifications" notificationsForm
+        <*  submitButton
     return (result, widget) -- no validation required here
   where
-    settingsFormT5T2 :: (Int,Theme,DateTimeFormat,DateTimeFormat,DateTimeFormat) -> (Bool,NotificationSettings) -> SettingsForm
-    settingsFormT5T2 = $(uncurryN 2) . $(uncurryN 5) SettingsForm
+    cosmeticsSection :: Text
+    cosmeticsSection = "Cosmetics"
+    notificationSection :: Text
+    notificationSection = "Notifications"
     themeList = [Option (display t) t (toPathPiece t) | t <- universeF]
-    cosmeticsForm = (,,,,)
-      <$> areq (natFieldI $ MsgNatField "Favoriten") -- TODO: natFieldI not working here
-            (fslpI MsgFavoriten "Anzahl Favoriten") (stgMaxFavourties <$> template)
-      <*> areq (selectField . return $ mkOptionList themeList)
-            (fslI  MsgTheme) { fsId = Just "theme-select" } (stgTheme         <$> template)
-      <*> areq (selectField $ dateTimeFormatOptions SelFormatDateTime) (fslI MsgDateTimeFormat) (stgDateTime <$> template)
-      <*> areq (selectField $ dateTimeFormatOptions SelFormatDate) (fslI MsgDateFormat) (stgDate <$> template)
-      <*> areq (selectField $ dateTimeFormatOptions SelFormatTime) (fslI MsgTimeFormat) (stgTime <$> template)
-    notificationsForm = (,)
-      <$> areq checkBoxField (fslI MsgDownloadFiles
-                               & setTooltip MsgDownloadFilesTip
-                             ) (stgDownloadFiles <$> template)
-      <*> (NotificationSettings <$> funcForm nsForm (fslI MsgNotificationSettings) True)
     nsForm nt = fromMaybe False <$> aopt checkBoxField (fslI nt) (Just $ flip notificationAllowed nt . stgNotificationSettings <$> template)
+--
+-- Version with proper grouping:
+--
+-- makeSettingForm :: Maybe SettingsForm -> Form SettingsForm
+-- makeSettingForm template = identForm FIDsettings $ \html -> do
+--     (result, widget) <- flip (renderAForm FormStandard) html $ settingsFormT5T2
+--       <$> aFormGroup "Cosmetics"     cosmeticsForm
+--       <*> aFormGroup "Notifications" notificationsForm
+--       <*  submitButton
+--     return (result, widget) -- no validation required here
+--   where
+--     settingsFormT5T2 :: (Int,Theme,DateTimeFormat,DateTimeFormat,DateTimeFormat) -> (Bool,NotificationSettings) -> SettingsForm
+--     settingsFormT5T2 = $(uncurryN 2) . $(uncurryN 5) SettingsForm
+--     themeList = [Option (display t) t (toPathPiece t) | t <- universeF]
+--     cosmeticsForm = (,,,,)
+--       <$> areq (natFieldI $ MsgNatField "Favoriten") -- TODO: natFieldI not working here
+--             (fslpI MsgFavoriten "Anzahl Favoriten") (stgMaxFavourties <$> template)
+--       <*> areq (selectField . return $ mkOptionList themeList)
+--             (fslI  MsgTheme) { fsId = Just "theme-select" } (stgTheme         <$> template)
+--       <*> areq (selectField $ dateTimeFormatOptions SelFormatDateTime) (fslI MsgDateTimeFormat) (stgDateTime <$> template)
+--       <*> areq (selectField $ dateTimeFormatOptions SelFormatDate) (fslI MsgDateFormat) (stgDate <$> template)
+--       <*> areq (selectField $ dateTimeFormatOptions SelFormatTime) (fslI MsgTimeFormat) (stgTime <$> template)
+--     notificationsForm = (,)
+--       <$> areq checkBoxField (fslI MsgDownloadFiles
+--                                & setTooltip MsgDownloadFilesTip
+--                              ) (stgDownloadFiles <$> template)
+--       <*> (NotificationSettings <$> funcForm nsForm (fslI MsgNotificationSettings) True)
+--     nsForm nt = fromMaybe False <$> aopt checkBoxField (fslI nt) (Just $ flip notificationAllowed nt . stgNotificationSettings <$> template)
 
 getProfileR, postProfileR :: Handler Html
 getProfileR = postProfileR
diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index 286a7d451..bb434e935 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -39,7 +39,7 @@ import Control.Monad.Writer.Class
 import Data.Scientific (Scientific)
 import Data.Ratio
 import Text.Read (readMaybe)
-import Text.Blaze (ToMarkup)
+import Text.Blaze (ToMarkup,preEscapedText)
 
 import Utils.Lens
 
@@ -640,6 +640,20 @@ infoField txt = Field { fieldEnctype = UrlEncoded
                       , fieldView  = \_theId _name _attrs _val _isReq ->
                            [whamlet|#{txt}|]
                       }
+aformSection :: (Monad m) => Text -> AForm m ()
+aformSection = formToAForm . formSection
+
+formSection :: (Monad m) => Text -> MForm m (FormResult (), [FieldView site]) -- TODO: WIP, delete
+formSection infoText = return (FormSuccess (), [infoView])
+  where
+    infoView = FieldView
+      { fvLabel = preEscapedText $ "<h3 class=form-group-title>" <> infoText <> "</h3>"
+      , fvTooltip = Nothing
+      , fvId = "formSection"
+      , fvErrors = Nothing
+      , fvRequired = False
+      , fvInput = mempty -- [whamlet|<h3 .form-group-title>#{infoText}|]
+      }
 
 infoForm :: Text -> Form () -- TODO: WIP, delete
 infoForm infoText csrf =

From e4f37a1bcc3666791ab3df91cadc3f85a6d16874 Mon Sep 17 00:00:00 2001
From: SJost <jost@tcs.ifi.lmu.de>
Date: Sat, 16 Feb 2019 17:04:13 +0100
Subject: [PATCH 07/17] templates/widgets/form-section-title.shamlet created
 for @hamannf

---
 src/Handler/Utils/Form.hs                    | 23 +++++++++++---------
 templates/widgets/form-section-title.shamlet |  2 ++
 2 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 templates/widgets/form-section-title.shamlet

diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index bb434e935..4e0102360 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -39,7 +39,8 @@ import Control.Monad.Writer.Class
 import Data.Scientific (Scientific)
 import Data.Ratio
 import Text.Read (readMaybe)
-import Text.Blaze (ToMarkup,preEscapedText)
+import Text.Blaze (ToMarkup)
+import Text.Hamlet (shamletFile)
 
 import Utils.Lens
 
@@ -640,19 +641,21 @@ infoField txt = Field { fieldEnctype = UrlEncoded
                       , fieldView  = \_theId _name _attrs _val _isReq ->
                            [whamlet|#{txt}|]
                       }
-aformSection :: (Monad m) => Text -> AForm m ()
-aformSection = formToAForm . formSection
+aformSection :: (Monad m, ToMarkup t) => t -> AForm m ()
+aformSection = formToAForm . fmap (second pure) . formSection
 
-formSection :: (Monad m) => Text -> MForm m (FormResult (), [FieldView site]) -- TODO: WIP, delete
-formSection infoText = return (FormSuccess (), [infoView])
+formSection :: (Monad m, ToMarkup t) => t -> MForm m (FormResult (), FieldView site) -- TODO: WIP, delete
+formSection formSectionTitle = return (FormSuccess (), infoView)
   where
+    flabel :: Html
+    flabel   = $(shamletFile "./templates/widgets/form-section-title.shamlet") -- TODO: Why must this be fully qualified?
     infoView = FieldView
-      { fvLabel = preEscapedText $ "<h3 class=form-group-title>" <> infoText <> "</h3>"
-      , fvTooltip = Nothing
-      , fvId = "formSection"
-      , fvErrors = Nothing
+      { fvLabel    = flabel
+      , fvTooltip  = Nothing
+      , fvId       = "formSection"
+      , fvErrors   = Nothing
       , fvRequired = False
-      , fvInput = mempty -- [whamlet|<h3 .form-group-title>#{infoText}|]
+      , fvInput    = mempty
       }
 
 infoForm :: Text -> Form () -- TODO: WIP, delete
diff --git a/templates/widgets/form-section-title.shamlet b/templates/widgets/form-section-title.shamlet
new file mode 100644
index 000000000..0f29e1b26
--- /dev/null
+++ b/templates/widgets/form-section-title.shamlet
@@ -0,0 +1,2 @@
+<h3 class=form-section-title>
+  #{formSectionTitle}
\ No newline at end of file

From 2b61d8f180f43410037de45f6b31a8d2cfba3be6 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 16 Feb 2019 18:30:56 +0100
Subject: [PATCH 08/17] add behavior section headline to profile form

---
 src/Handler/Profile.hs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs
index 2a5a69b91..6a1f6b2cf 100644
--- a/src/Handler/Profile.hs
+++ b/src/Handler/Profile.hs
@@ -37,10 +37,11 @@ makeSettingForm template = identForm FIDsettings $ \html -> do
         <*> areq (selectField $ dateTimeFormatOptions SelFormatDateTime) (fslI MsgDateTimeFormat) (stgDateTime <$> template)
         <*> areq (selectField $ dateTimeFormatOptions SelFormatDate) (fslI MsgDateFormat) (stgDate <$> template)
         <*> areq (selectField $ dateTimeFormatOptions SelFormatTime) (fslI MsgTimeFormat) (stgTime <$> template)
-        <*  aformSection notificationSection
+        <*  aformSection behaviorSection
         <*> areq checkBoxField (fslI MsgDownloadFiles
                                    & setTooltip MsgDownloadFilesTip
                                 ) (stgDownloadFiles <$> template)
+        <*  aformSection notificationSection
         <*> (NotificationSettings <$> funcForm nsForm (fslI MsgNotificationSettings) True)
     --   <$> aFormGroup "Cosmetics"     cosmeticsForm
     --   <*> aFormGroup "Notifications" notificationsForm
@@ -49,6 +50,8 @@ makeSettingForm template = identForm FIDsettings $ \html -> do
   where
     cosmeticsSection :: Text
     cosmeticsSection = "Cosmetics"
+    behaviorSection :: Text
+    behaviorSection = "Behavior"
     notificationSection :: Text
     notificationSection = "Notifications"
     themeList = [Option (display t) t (toPathPiece t) | t <- universeF]

From a5659aa7378d35ff9b177b8363944df6c9b820df Mon Sep 17 00:00:00 2001
From: SJost <jost@tcs.ifi.lmu.de>
Date: Sun, 17 Feb 2019 07:42:30 +0100
Subject: [PATCH 09/17] Form section titles via fvId; working, but code cleanup
 needed.

---
 messages/uniworx/de.msg       |  3 +++
 src/Handler/Profile.hs        | 14 +++-----------
 src/Handler/Utils/Form.hs     | 20 ++++++++++++++++----
 templates/widgets/form.hamlet | 33 ++++++++++++++++++++++++---------
 4 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 7fa4c8bce..4002461e1 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -344,6 +344,9 @@ TimeFormat: Uhrzeitformat
 DownloadFiles: Dateien automatisch herunterladen
 DownloadFilesTip: Wenn gesetzt werden Dateien von Abgaben und Übungsblättern automatisch als Download behandelt, ansonsten ist das Verhalten browserabhängig (es können z.B. PDFs im Browser geöffnet werden).
 NotificationSettings: Erwünschte Benachrichtigungen
+FormNotifications: Benachrichtigungen
+FormBehaviour: Verhalten
+FormCosmetics: Oberfläche
 
 ActiveAuthTags: Aktivierte Authorisierungsprädikate
 
diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs
index 6a1f6b2cf..4551f6657 100644
--- a/src/Handler/Profile.hs
+++ b/src/Handler/Profile.hs
@@ -29,7 +29,7 @@ data SettingsForm = SettingsForm
 makeSettingForm :: Maybe SettingsForm -> Form SettingsForm
 makeSettingForm template = identForm FIDsettings $ \html -> do
     (result, widget) <- flip (renderAForm FormStandard) html $ SettingsForm
-        <$  aformSection cosmeticsSection
+        <$  aformSection MsgFormCosmetics
         <*> areq (natFieldI $ MsgNatField "Favoriten") -- TODO: natFieldI not working here
             (fslpI MsgFavoriten "Anzahl Favoriten") (stgMaxFavourties <$> template)
         <*> areq (selectField . return $ mkOptionList themeList)
@@ -37,23 +37,15 @@ makeSettingForm template = identForm FIDsettings $ \html -> do
         <*> areq (selectField $ dateTimeFormatOptions SelFormatDateTime) (fslI MsgDateTimeFormat) (stgDateTime <$> template)
         <*> areq (selectField $ dateTimeFormatOptions SelFormatDate) (fslI MsgDateFormat) (stgDate <$> template)
         <*> areq (selectField $ dateTimeFormatOptions SelFormatTime) (fslI MsgTimeFormat) (stgTime <$> template)
-        <*  aformSection behaviorSection
+        <*  aformSection MsgFormBehaviour
         <*> areq checkBoxField (fslI MsgDownloadFiles
                                    & setTooltip MsgDownloadFilesTip
                                 ) (stgDownloadFiles <$> template)
-        <*  aformSection notificationSection
+        <*  aformSection MsgFormNotifications
         <*> (NotificationSettings <$> funcForm nsForm (fslI MsgNotificationSettings) True)
-    --   <$> aFormGroup "Cosmetics"     cosmeticsForm
-    --   <*> aFormGroup "Notifications" notificationsForm
         <*  submitButton
     return (result, widget) -- no validation required here
   where
-    cosmeticsSection :: Text
-    cosmeticsSection = "Cosmetics"
-    behaviorSection :: Text
-    behaviorSection = "Behavior"
-    notificationSection :: Text
-    notificationSection = "Notifications"
     themeList = [Option (display t) t (toPathPiece t) | t <- universeF]
     nsForm nt = fromMaybe False <$> aopt checkBoxField (fslI nt) (Just $ flip notificationAllowed nt . stgNotificationSettings <$> template)
 --
diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index 4e0102360..742a21407 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -641,18 +641,30 @@ infoField txt = Field { fieldEnctype = UrlEncoded
                       , fieldView  = \_theId _name _attrs _val _isReq ->
                            [whamlet|#{txt}|]
                       }
-aformSection :: (Monad m, ToMarkup t) => t -> AForm m ()
+aformSection :: (MonadHandler m, site ~ HandlerSite m, RenderMessage site msg) => msg -> AForm m ()
 aformSection = formToAForm . fmap (second pure) . formSection
 
-formSection :: (Monad m, ToMarkup t) => t -> MForm m (FormResult (), FieldView site) -- TODO: WIP, delete
-formSection formSectionTitle = return (FormSuccess (), infoView)
+formSection :: (MonadHandler m, site ~ HandlerSite m, RenderMessage site msg) => msg -> MForm m (FormResult (), FieldView site) -- TODO: WIP, delete
+formSection formSectionTitle = do
+    mr <- getMessageRender
+    return (FormSuccess (), FieldView
+      { fvLabel    = toHtml $ mr formSectionTitle
+      , fvTooltip  = Nothing
+      , fvId       = "form-section-noinput"
+      , fvErrors   = Nothing
+      , fvRequired = False
+      , fvInput    = mempty
+      })
+
+formSection' :: (Monad m, ToMarkup t) => t -> MForm m (FormResult (), FieldView site) -- TODO: WIP, delete
+formSection' formSectionTitle = return (FormSuccess (), infoView)
   where
     flabel :: Html
     flabel   = $(shamletFile "./templates/widgets/form-section-title.shamlet") -- TODO: Why must this be fully qualified?
     infoView = FieldView
       { fvLabel    = flabel
       , fvTooltip  = Nothing
-      , fvId       = "formSection"
+      , fvId       = "form-section-noinput"
       , fvErrors   = Nothing
       , fvRequired = False
       , fvInput    = mempty
diff --git a/templates/widgets/form.hamlet b/templates/widgets/form.hamlet
index 08d37adfc..e961ff4ad 100644
--- a/templates/widgets/form.hamlet
+++ b/templates/widgets/form.hamlet
@@ -3,16 +3,31 @@ $newline never
 $case formLayout
   $of FormDBTablePagesize
     $forall view <- fieldViews
-      <label .form-group__label.label-pagesize for=#{fvId view}>#{fvLabel view}
-      ^{fvInput view}
+      $if fvId view == "form-section-noinput"
+        <label .form-group__label>
+          <h3 .form-section-title>
+            ^{fvInput view}
+      $else
+        <label .form-group__label.label-pagesize for=#{fvId view}>#{fvLabel view}
+        ^{fvInput view}
   $of _
     $forall view <- fieldViews
       $# TODO: add class 'form-group--submit' if this is the submit-button view
       <div .form-group :fvRequired view:.form-group--required :not $ fvRequired view:.form-group--optional :isJust $ fvErrors view:.form-group--has-error>
-        $if not (Blaze.null $ fvLabel view)
-          <label .form-group__label for=#{fvId view}>
-            #{fvLabel view}
-            $maybe hint <- fvTooltip view
-              <div .form-group__hint>^{hint}
-        <div .form-group__input>
-          ^{fvInput view}
+        $if fvId view == "form-section-noinput"
+          <label .form-group__label>
+            <h3 .form-section-title>
+              ^{fvLabel view}
+              $maybe hint <- fvTooltip view
+                  <div .form-group__hint>^{hint}
+        $else
+          $if not (Blaze.null $ fvLabel view)
+            <label .form-group__label for=#{fvId view}>
+              #{fvLabel view}
+              $maybe hint <- fvTooltip view
+                <div .form-group__hint>^{hint}
+              $# TODO: check that error display works as intended
+              $maybe err <- fvErrors view
+                <div .form-error>#{err}
+          <div .form-group__input>
+            ^{fvInput view}

From 780e96320cebfdebacc57c3f3c42abdff6423e54 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 17 Feb 2019 11:29:34 +0100
Subject: [PATCH 10/17] change form template to output flatter HTML

---
 templates/widgets/form.hamlet | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/templates/widgets/form.hamlet b/templates/widgets/form.hamlet
index e961ff4ad..4ded9d91a 100644
--- a/templates/widgets/form.hamlet
+++ b/templates/widgets/form.hamlet
@@ -3,31 +3,22 @@ $newline never
 $case formLayout
   $of FormDBTablePagesize
     $forall view <- fieldViews
-      $if fvId view == "form-section-noinput"
-        <label .form-group__label>
-          <h3 .form-section-title>
-            ^{fvInput view}
-      $else
-        <label .form-group__label.label-pagesize for=#{fvId view}>#{fvLabel view}
-        ^{fvInput view}
+      <label .form-group__label.label-pagesize for=#{fvId view}>#{fvLabel view}
+      ^{fvInput view}
   $of _
     $forall view <- fieldViews
-      $# TODO: add class 'form-group--submit' if this is the submit-button view
-      <div .form-group :fvRequired view:.form-group--required :not $ fvRequired view:.form-group--optional :isJust $ fvErrors view:.form-group--has-error>
-        $if fvId view == "form-section-noinput"
-          <label .form-group__label>
-            <h3 .form-section-title>
-              ^{fvLabel view}
-              $maybe hint <- fvTooltip view
-                  <div .form-group__hint>^{hint}
-        $else
+      $if fvId view == "form-section-noinput"
+        <h3 .form-section-title>
+          ^{fvLabel view}
+      $else
+        <div .form-group :fvRequired view:.form-group--required :not $ fvRequired view:.form-group--optional :isJust $ fvErrors view:.form-group--has-error>
           $if not (Blaze.null $ fvLabel view)
             <label .form-group__label for=#{fvId view}>
               #{fvLabel view}
               $maybe hint <- fvTooltip view
                 <div .form-group__hint>^{hint}
-              $# TODO: check that error display works as intended
-              $maybe err <- fvErrors view
-                <div .form-error>#{err}
           <div .form-group__input>
             ^{fvInput view}
+            $# TODO: check that error display works as intended
+            $maybe err <- fvErrors view
+              <div .form-error>#{err}

From d177edd4207722726d5e082a193bb139ca500b02 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 17 Feb 2019 11:36:16 +0100
Subject: [PATCH 11/17] move formgroup-inputs without formgroup-label to the
 right

---
 templates/widgets/form.lucius | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/templates/widgets/form.lucius b/templates/widgets/form.lucius
index 9f330f75c..2c2a56aa2 100644
--- a/templates/widgets/form.lucius
+++ b/templates/widgets/form.lucius
@@ -11,6 +11,12 @@ fieldset {
   margin-bottom: 0;
 }
 
+@media (min-width: 769px) {
+  .form-group__input {
+    grid-column: 2;
+  }
+}
+
 [data-autosubmit][type="submit"] {
   animation: fade-in 500ms ease-in-out backwards;
   animation-delay: 500ms;

From 8247cb6a506c5a88294024e9d96f0376d139a40a Mon Sep 17 00:00:00 2001
From: SJost <jost@tcs.ifi.lmu.de>
Date: Sun, 17 Feb 2019 15:03:56 +0100
Subject: [PATCH 12/17] Code cleaning done.

---
 src/Handler/Utils/Form.hs                    | 65 --------------------
 src/Utils/Form.hs                            | 64 ++++++++++++++++++-
 templates/formPageI18n.hamlet                |  2 +-
 templates/widgets/aform-group.hamlet         |  8 ---
 templates/widgets/form-group.hamlet          |  4 --
 templates/widgets/form-section-title.shamlet |  2 -
 templates/widgets/form.hamlet                |  2 +-
 7 files changed, 63 insertions(+), 84 deletions(-)
 delete mode 100644 templates/widgets/aform-group.hamlet
 delete mode 100644 templates/widgets/form-group.hamlet
 delete mode 100644 templates/widgets/form-section-title.shamlet

diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index 742a21407..ae7240831 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -39,8 +39,6 @@ import Control.Monad.Writer.Class
 import Data.Scientific (Scientific)
 import Data.Ratio
 import Text.Read (readMaybe)
-import Text.Blaze (ToMarkup)
-import Text.Hamlet (shamletFile)
 
 import Utils.Lens
 
@@ -289,7 +287,6 @@ multiFileField permittedFiles' = Field{..}
       Right _ -> return ()
       Left  r -> yield r
 
-
 data SheetGrading' = Points' | PassPoints' | PassBinary'
   deriving (Eq, Ord, Read, Show, Enum, Bounded)
 
@@ -632,65 +629,3 @@ formResultModal res finalDest handler = maybeT_ $ do
     | otherwise -> do
         forM_ messages $ \Message{..} -> addMessage messageClass messageContent
         redirect finalDest
-
-
--- TODO / WIP: form groups, needs cleanup once it works
-infoField :: (Monad m, HandlerSite m ~ UniWorX, ToMarkup t) => t -> Field m () --TODO if kept, move to fields, more likely delete this workaround
-infoField txt = Field { fieldEnctype = UrlEncoded
-                      , fieldParse = const $ const $ return $ Right $ Just ()
-                      , fieldView  = \_theId _name _attrs _val _isReq ->
-                           [whamlet|#{txt}|]
-                      }
-aformSection :: (MonadHandler m, site ~ HandlerSite m, RenderMessage site msg) => msg -> AForm m ()
-aformSection = formToAForm . fmap (second pure) . formSection
-
-formSection :: (MonadHandler m, site ~ HandlerSite m, RenderMessage site msg) => msg -> MForm m (FormResult (), FieldView site) -- TODO: WIP, delete
-formSection formSectionTitle = do
-    mr <- getMessageRender
-    return (FormSuccess (), FieldView
-      { fvLabel    = toHtml $ mr formSectionTitle
-      , fvTooltip  = Nothing
-      , fvId       = "form-section-noinput"
-      , fvErrors   = Nothing
-      , fvRequired = False
-      , fvInput    = mempty
-      })
-
-formSection' :: (Monad m, ToMarkup t) => t -> MForm m (FormResult (), FieldView site) -- TODO: WIP, delete
-formSection' formSectionTitle = return (FormSuccess (), infoView)
-  where
-    flabel :: Html
-    flabel   = $(shamletFile "./templates/widgets/form-section-title.shamlet") -- TODO: Why must this be fully qualified?
-    infoView = FieldView
-      { fvLabel    = flabel
-      , fvTooltip  = Nothing
-      , fvId       = "form-section-noinput"
-      , fvErrors   = Nothing
-      , fvRequired = False
-      , fvInput    = mempty
-      }
-
-infoForm :: Text -> Form () -- TODO: WIP, delete
-infoForm infoText csrf =
-  let widget = [whamlet|#{csrf}
-                <h3 .form-group-title>#{infoText}
-               |]
-  in  return (FormSuccess (), widget)
-
-aFormGroup :: (MonadHandler m, HandlerSite m ~ UniWorX) => String -> AForm m a -> AForm m a
-aFormGroup groupTitle innerForm =
-  -- THIS IS JUST A WORKAROUND, SERIOUS ATTEMPT COMMENTED OUT BELOW
-   grpHeader *> innerForm
-  where
-    emptyT :: Text
-    emptyT = ""
-    grpHeader = aopt (infoField emptyT) (fromString groupTitle) Nothing
-  -- -- attempt through double converision
-  -- where mInner = do
-  --   let (result, ($ []) -> fieldViews) = aFormToForm innerForm
-  --   return (result, $(widgetFile "widgets/aform-group"))
-
-formGroup :: Text -> Form a -> Form a
-formGroup groupTitle innerForm csrf = do
-  (result,fGroup) <- innerForm csrf
-  return (result,$(widgetFile "widgets/form-group"))
\ No newline at end of file
diff --git a/src/Utils/Form.hs b/src/Utils/Form.hs
index 19e8e3cb8..761afbe02 100644
--- a/src/Utils/Form.hs
+++ b/src/Utils/Form.hs
@@ -41,13 +41,42 @@ data FormLayout = FormStandard | FormDBTableFilter | FormDBTablePagesize
 
 renderAForm :: Monad m => FormLayout -> FormRender m a
 renderAForm formLayout aform fragment = do
-  -- let lab1 :: Text
-  --     lab1 = "LABEL"
-  -- let demo = [FieldView (toMarkup lab1) Nothing "someID" [whamlet|FIELD|] Nothing False]
   (res, ($ []) -> fieldViews) <- aFormToForm aform
   let widget = $(widgetFile "widgets/form")
   return (res, widget)
 
+-- | special id to identify form section headers, see 'aformSection' and 'formSection'
+--   currently only treated by form generation through 'renderAForm'
+idFormSectionNoinput :: Text
+idFormSectionNoinput = "form-section-noinput"
+
+-- | Generates a form having just a form-section-header and no input title.
+--   Currently only correctly rendered by 'renderAForm' and mforms using 'widget/form.hamlet'
+--   Usage:
+--   @
+--      (,) <$  formSection MsgInt
+--          <*> areq intField "int here" Nothing
+--          <*  formSection MsgDouble
+--          <*> areq doubleField "double there " Nothing
+--          <*  submitButton
+--   @
+--   If tooltips or other attributes are required, see 'formSection\'' instead.
+aformSection :: (MonadHandler m, site ~ HandlerSite m, RenderMessage site msg) => msg -> AForm m ()
+aformSection = formToAForm . fmap (second pure) . formSection
+
+formSection :: (MonadHandler m, site ~ HandlerSite m, RenderMessage site msg) => msg -> MForm m (FormResult (), FieldView site) -- TODO: WIP, delete
+formSection formSectionTitle = do
+    mr <- getMessageRender
+    return (FormSuccess (), FieldView
+      { fvLabel    = toHtml $ mr formSectionTitle
+      , fvTooltip  = Nothing
+      , fvId       = idFormSectionNoinput
+      , fvErrors   = Nothing
+      , fvRequired = False
+      , fvInput    = mempty
+      })
+
+
 --------------------
 -- Field Settings --
 --------------------
@@ -317,6 +346,13 @@ autosubmitButton = combinedButtonFieldF_ (Proxy @ButtonSubmit) $ "" & addAutosub
 -- Custom Fields --
 -------------------
 
+-- | empty field that has no view and always succeeds, useful for form sections having only a label
+noinputField :: Monad m => Field m ()
+noinputField = Field  { fieldEnctype = UrlEncoded
+                      , fieldParse = const $ const $ return $ Right $ Just ()
+                      , fieldView  = \_theId _name _attrs _val _isReq -> mempty
+                      }
+
 ciField :: ( Textual t
            , CI.FoldCase t
            , Monad m
@@ -380,6 +416,26 @@ optionsFinite = do
       }
   return . mkOptionList $ mkOption <$> universeF
 
+-------------------
+-- Special Forms --
+-------------------
+
+aformSection' :: (MonadHandler m, site ~ HandlerSite m, RenderMessage site FormMessage) => SomeMessage site -> AForm m ()
+aformSection' = formToAForm . fmap (second pure) . formSection'
+
+-- | Alternative implementation for 'formSection' in a more standard that shows how allows tooltips and attributs
+formSection' :: (MonadHandler m, site ~ HandlerSite m, RenderMessage site FormMessage) => SomeMessage site -> MForm m (FormResult (), FieldView site) -- TODO: WIP, delete
+formSection' formSectionTitle = mreq noinputField sectionSettings Nothing
+  where
+    sectionSettings = FieldSettings
+      { fsLabel    = formSectionTitle
+      , fsTooltip  = Nothing
+      , fsId       = Just idFormSectionNoinput
+      , fsName     = Nothing
+      , fsAttrs    = [("classy",idFormSectionNoinput)] -- TODO: check if this it useful at all
+      }
+
+
 
 ---------------------
 -- Form evaluation --
@@ -447,3 +503,5 @@ prismAForm :: Monad m => Prism' s a -> Maybe s ->  (Maybe a -> AForm m a) -> AFo
 prismAForm p outer form = review p <$> form inner
   where
     inner = outer >>= preview p
+
+
diff --git a/templates/formPageI18n.hamlet b/templates/formPageI18n.hamlet
index bf8b877ca..bbdc87853 100644
--- a/templates/formPageI18n.hamlet
+++ b/templates/formPageI18n.hamlet
@@ -1,5 +1,5 @@
 $maybe text <- formText
-  <h3>
+  <h2>
     _{text}
 <form method=post action=@{actionUrl}#forms enctype=#{formEnctype}>
    ^{formWidget}
diff --git a/templates/widgets/aform-group.hamlet b/templates/widgets/aform-group.hamlet
deleted file mode 100644
index 4a868bd14..000000000
--- a/templates/widgets/aform-group.hamlet
+++ /dev/null
@@ -1,8 +0,0 @@
-$newline never
-<h3 .form-group-title>#{groupTitle} TODO
-<div .form-group>
-  $forall view <- fieldViews
-    <label .form-group__label for=#{fvId view}>
-      #{fvLabel view}
-    <div .form-group__input>
-      ^{fvInput view}
\ No newline at end of file
diff --git a/templates/widgets/form-group.hamlet b/templates/widgets/form-group.hamlet
deleted file mode 100644
index ea9fb123e..000000000
--- a/templates/widgets/form-group.hamlet
+++ /dev/null
@@ -1,4 +0,0 @@
-$newline never
-<h3 .form-group-title>#{groupTitle} TODO
-<div .form-group>
-  ^{fGroup}
\ No newline at end of file
diff --git a/templates/widgets/form-section-title.shamlet b/templates/widgets/form-section-title.shamlet
deleted file mode 100644
index 0f29e1b26..000000000
--- a/templates/widgets/form-section-title.shamlet
+++ /dev/null
@@ -1,2 +0,0 @@
-<h3 class=form-section-title>
-  #{formSectionTitle}
\ No newline at end of file
diff --git a/templates/widgets/form.hamlet b/templates/widgets/form.hamlet
index 4ded9d91a..96c650fad 100644
--- a/templates/widgets/form.hamlet
+++ b/templates/widgets/form.hamlet
@@ -7,7 +7,7 @@ $case formLayout
       ^{fvInput view}
   $of _
     $forall view <- fieldViews
-      $if fvId view == "form-section-noinput"
+      $if fvId view == idFormSectionNoinput
         <h3 .form-section-title>
           ^{fvLabel view}
       $else

From ad5741e4aefa5a9743b10c46408bdf8bd951a335 Mon Sep 17 00:00:00 2001
From: SJost <jost@tcs.ifi.lmu.de>
Date: Sun, 17 Feb 2019 15:25:36 +0100
Subject: [PATCH 13/17] minor refactor

---
 src/Utils/Form.hs | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/Utils/Form.hs b/src/Utils/Form.hs
index 17a0f362f..0391faea1 100644
--- a/src/Utils/Form.hs
+++ b/src/Utils/Form.hs
@@ -430,20 +430,18 @@ optionsFinite = do
 -- Special Forms --
 -------------------
 
-aformSection' :: (MonadHandler m, site ~ HandlerSite m, RenderMessage site FormMessage) => SomeMessage site -> AForm m ()
+-- | Alternative implementation for 'aformSection' in a more standard that
+--  allows tooltips and arbitrary attributs. Section header must be given through `fsLabel`
+aformSection' :: (MonadHandler m, site ~ HandlerSite m, RenderMessage site FormMessage) => FieldSettings site -> AForm m ()
 aformSection' = formToAForm . fmap (second pure) . formSection'
 
--- | Alternative implementation for 'formSection' in a more standard that shows how allows tooltips and attributs
-formSection' :: (MonadHandler m, site ~ HandlerSite m, RenderMessage site FormMessage) => SomeMessage site -> MForm m (FormResult (), FieldView site) -- TODO: WIP, delete
-formSection' formSectionTitle = mreq noinputField sectionSettings Nothing
+-- | Alternative implementation for 'formSection' in a more standard that
+--  allows tooltips and arbitrary attributs. Section header must be given through `fsLabel`
+formSection' :: (MonadHandler m, site ~ HandlerSite m, RenderMessage site FormMessage) =>
+   FieldSettings site  -> MForm m (FormResult (), FieldView site) -- TODO: WIP, delete
+formSection' formSectionTitleSettings = mreq noinputField sectionSettings Nothing
   where
-    sectionSettings = FieldSettings
-      { fsLabel    = formSectionTitle
-      , fsTooltip  = Nothing
-      , fsId       = Just idFormSectionNoinput
-      , fsName     = Nothing
-      , fsAttrs    = [("class",idFormSectionNoinput)] -- TODO: check if this it useful at all
-      }
+    sectionSettings = formSectionTitleSettings { fsId = Just idFormSectionNoinput }
 
 
 

From 184ebaf064ca05d283c9081ef8c873fdbd30d744 Mon Sep 17 00:00:00 2001
From: SJost <jost@tcs.ifi.lmu.de>
Date: Mon, 18 Feb 2019 09:36:25 +0100
Subject: [PATCH 14/17] Form error demonstration added to 'AdminTestR'

---
 src/Handler/Admin.hs          | 55 +++++++++++++++++++++++++++++++++--
 src/Handler/Utils/Form.hs     |  5 ++--
 templates/formPage.hamlet     |  7 +++--
 templates/formPageI18n.hamlet |  7 +++--
 4 files changed, 66 insertions(+), 8 deletions(-)

diff --git a/src/Handler/Admin.hs b/src/Handler/Admin.hs
index a159489fe..77c7c42de 100644
--- a/src/Handler/Admin.hs
+++ b/src/Handler/Admin.hs
@@ -54,6 +54,24 @@ emailTestForm = (,)
       SelFormatDate -> d
       SelFormatTime -> t
 
+makeDemoForm :: Int -> Form (Int,Bool,Double)
+makeDemoForm n = identifyForm "adminTestForm" $ \html -> do -- Important: used identForm instead!
+    (result, widget) <- flip (renderAForm FormStandard) html $ (,,)
+        <$> areq (minIntField n "Zahl") (fromString $ "Ganzzahl > " ++ show n) Nothing
+        <*  aformSection MsgFormBehaviour
+        <*> areq checkBoxField "Muss nächste Zahl größer sein?" (Just True)
+        <*> areq doubleField "Fliesskommazahl" Nothing
+        <*  submitButton
+    return $ case result of
+      FormSuccess fsres
+        | errorMsgs <- validateResult fsres
+        , not $ null errorMsgs -> (FormFailure errorMsgs, widget)
+      _otherwise -> (result, widget)
+  where
+    validateResult :: (Int,Bool,Double) -> [Text]
+    validateResult (i,True,d) | (fromIntegral i) >= d = [tshow d <> " ist nicht größer als " <> tshow i, "Zweite Fehlermeldung", "Dritte Fehlermeldung"]
+    validateResult _other = []
+
 
 getAdminTestR, postAdminTestR :: Handler Html -- Demo Page. Referenzimplementierungen sollte hier gezeigt werden!
 getAdminTestR = postAdminTestR
@@ -81,10 +99,43 @@ postAdminTestR = do
           ^{emailWidget}
       |]
 
-  defaultLayout $
-    -- setTitle "Uni2work Admin Testpage"
+
+  let demoFormAction (_i,_b,_d) = addMessage Info "All ok."
+  ((demoResult, formWidget),formEnctype) <- runFormPost $ makeDemoForm 7
+  formResult demoResult demoFormAction
+  let actionUrl = AdminTestR
+  let showDemoResult = [whamlet|
+          $maybe (i,b,d) <- formResult' demoResult
+            Received values:
+              <ul>
+                <li>#{show i}
+                <li>#{show b}
+                <li>#{show d}
+          $nothing
+            No form values received, due to #
+            $# Using formResult' above means that we usually to not distinguish the following two cases here, sind formResult does this already:
+            $case demoResult
+              $of FormSuccess _
+                $# Already dealt with above, to showecase usage of formResult' as normally done.
+                success, which should not happen here.
+              $of FormMissing
+                Form data missing, probably empty.
+              $of FormFailure msgs
+                <ul>
+                  $forall m <- msgs
+                    <li>#{m}
+        |]
+
+  let locallyDefinedPageHeading = [whamlet|Admin TestPage for Uni2work|]
+  siteLayout locallyDefinedPageHeading $ do
+  -- defaultLayout $ do
+    setTitle "Uni2work Admin Testpage"
     $(widgetFile "adminTest")
 
+    [whamlet|<h2>Formular Demonstration|]
+    $(widgetFile "formPage")
+    showDemoResult
+
 
 getAdminErrMsgR, postAdminErrMsgR :: Handler Html
 getAdminErrMsgR = postAdminErrMsgR
diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index 237689dd5..995bcd12f 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -156,10 +156,11 @@ natIntField ::(Monad m, RenderMessage (HandlerSite m) FormMessage) => Text -> Fi
 natIntField = natField
 
 posIntField :: (Monad m, Integral i, RenderMessage (HandlerSite m) FormMessage) => Text -> Field m i
-posIntField d = checkBool (>= 1) (T.append  d " muss eine positive Zahl sein.") intField
+posIntField d = checkBool (> 0) (T.append  d " muss eine positive Zahl sein.") intField
 
+-- | Field to request integral number > 'm'
 minIntField :: (Monad m, Integral i, Show i, RenderMessage (HandlerSite m) FormMessage) => i -> Text -> Field m i
-minIntField m d = checkBool (>= m) (T.concat [d," muss größer als ", T.pack $ show m, " sein."]) intField
+minIntField m d = checkBool (> m) (T.concat [d," muss größer als ", T.pack $ show m, " sein."]) intField
 
 pointsField :: (Monad m, HandlerSite m ~ UniWorX) => Field m Points --TODO allow fractions
 pointsField = checkBool (>= 0) MsgPointsNotPositive Field{..}
diff --git a/templates/formPage.hamlet b/templates/formPage.hamlet
index c0b36d13f..0e5b34298 100644
--- a/templates/formPage.hamlet
+++ b/templates/formPage.hamlet
@@ -1,2 +1,5 @@
-<form method=post action=@{actionUrl}#forms enctype=#{formEnctype}>
-  ^{formWidget}
+$newline never
+$#TODO: anchor must be generic for working with multiple forms
+<a name="forms">
+  <form method=post action=@{actionUrl}#forms enctype=#{formEnctype}>
+    ^{formWidget}
diff --git a/templates/formPageI18n.hamlet b/templates/formPageI18n.hamlet
index bbdc87853..5462f98a7 100644
--- a/templates/formPageI18n.hamlet
+++ b/templates/formPageI18n.hamlet
@@ -1,5 +1,8 @@
+$newline never
 $maybe text <- formText
   <h2>
     _{text}
-<form method=post action=@{actionUrl}#forms enctype=#{formEnctype}>
-   ^{formWidget}
+$#TODO: anchor must be generic for working with multiple forms
+<a name="forms">
+  <form method=post action=@{actionUrl}#forms enctype=#{formEnctype}>
+    ^{formWidget}

From c627348bd6aa0c926a777acb0fff072863c59d81 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Tue, 19 Feb 2019 21:03:08 +0100
Subject: [PATCH 15/17] remove obsolete comment from form.hamlet

---
 templates/widgets/form.hamlet | 1 -
 1 file changed, 1 deletion(-)

diff --git a/templates/widgets/form.hamlet b/templates/widgets/form.hamlet
index 96c650fad..87f40532c 100644
--- a/templates/widgets/form.hamlet
+++ b/templates/widgets/form.hamlet
@@ -19,6 +19,5 @@ $case formLayout
                 <div .form-group__hint>^{hint}
           <div .form-group__input>
             ^{fvInput view}
-            $# TODO: check that error display works as intended
             $maybe err <- fvErrors view
               <div .form-error>#{err}

From 1e122eac87ad685bef797dc63acc9d28ba455b78 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Tue, 19 Feb 2019 21:49:34 +0100
Subject: [PATCH 16/17] move actual forms out of forms anchor

---
 templates/formPage.hamlet     | 6 +++---
 templates/formPageI18n.hamlet | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/formPage.hamlet b/templates/formPage.hamlet
index 0e5b34298..546328422 100644
--- a/templates/formPage.hamlet
+++ b/templates/formPage.hamlet
@@ -1,5 +1,5 @@
 $newline never
 $#TODO: anchor must be generic for working with multiple forms
-<a name="forms">
-  <form method=post action=@{actionUrl}#forms enctype=#{formEnctype}>
-    ^{formWidget}
+<a id="forms">
+<form method=post action=@{actionUrl}#forms enctype=#{formEnctype}>
+  ^{formWidget}
diff --git a/templates/formPageI18n.hamlet b/templates/formPageI18n.hamlet
index 5462f98a7..6b5b0b2e8 100644
--- a/templates/formPageI18n.hamlet
+++ b/templates/formPageI18n.hamlet
@@ -3,6 +3,6 @@ $maybe text <- formText
   <h2>
     _{text}
 $#TODO: anchor must be generic for working with multiple forms
-<a name="forms">
-  <form method=post action=@{actionUrl}#forms enctype=#{formEnctype}>
-    ^{formWidget}
+<a id="forms">
+<form method=post action=@{actionUrl}#forms enctype=#{formEnctype}>
+  ^{formWidget}

From 68d36b2fe0687faf7a3bbf1c76cecf65fda5455b Mon Sep 17 00:00:00 2001
From: SJost <jost@tcs.ifi.lmu.de>
Date: Fri, 22 Feb 2019 07:47:20 +0100
Subject: [PATCH 17/17] Course description as icon complete

---
 src/Handler/Course.hs | 40 +++++++++++++++++++++-------------------
 test/Database.hs      | 15 ++++++++++++++-
 2 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 99c242802..eb0936540 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -34,10 +34,10 @@ colCourse = sortable (Just "course") (i18nCell MsgCourse)
             anchorCell (CourseR courseTerm courseSchool courseShorthand CShowR)
               [whamlet|#{display courseName}|]
 
-colCourseDescr :: IsDBTable m a => Colonnade Sortable CourseTableData (DBCell m a)
-colCourseDescr = sortable (Just "course") (i18nCell MsgCourse) $ do
-    course <- view $ _dbrOutput . _1 . _entityVal
-    return $ courseCell course
+-- colCourseDescr :: IsDBTable m a => Colonnade Sortable CourseTableData (DBCell m a)
+-- colCourseDescr = sortable (Just "course") (i18nCell MsgCourse) $ do
+--     course <- view $ _dbrOutput . _1 . _entityVal
+--     return $ courseCell course
 
 colDescription :: IsDBTable m a => Colonnade Sortable CourseTableData (DBCell m a)
 colDescription = sortable Nothing mempty
@@ -51,19 +51,19 @@ colCShort = sortable (Just "cshort") (i18nCell MsgCourseShort)
           $ \DBRow{ dbrOutput=(Entity _ Course{..}, _, _, _) } ->
             anchorCell (CourseR courseTerm courseSchool courseShorthand CShowR) [whamlet|#{display courseShorthand}|]
 
-colCShortDescr :: IsDBTable m a => Colonnade _ CourseTableData (DBCell m a)
-colCShortDescr = sortable (Just "cshort") (i18nCell MsgCourseShort)
-          $ \DBRow{ dbrOutput=(Entity _ Course{..}, _, _, _) } -> mappend
-            ( anchorCell (CourseR courseTerm courseSchool courseShorthand CShowR) [whamlet|#{display courseShorthand}|] )
-            ( case courseDescription of
-                Nothing      -> mempty
-                (Just descr) -> cell
-                  [whamlet|
-                    $newline never
-                    <div>
-                      ^{modal "Beschreibung" (Right $ toWidget descr)}
-                  |]
-            )
+-- colCShortDescr :: IsDBTable m a => Colonnade _ CourseTableData (DBCell m a)
+-- colCShortDescr = sortable (Just "cshort") (i18nCell MsgCourseShort)
+--           $ \DBRow{ dbrOutput=(Entity _ Course{..}, _, _, _) } -> mappend
+--             ( anchorCell (CourseR courseTerm courseSchool courseShorthand CShowR) [whamlet|#{display courseShorthand}|] )
+--             ( case courseDescription of
+--                 Nothing      -> mempty
+--                 (Just descr) -> cell
+--                   [whamlet|
+--                     $newline never
+--                     <div>
+--                       ^{modal "Beschreibung" (Right $ toWidget descr)}
+--                   |]
+--             )
 
 colTerm :: IsDBTable m a => Colonnade _ CourseTableData (DBCell m a)
 colTerm = sortable (Just "term") (i18nCell MsgTerm)
@@ -221,7 +221,8 @@ getTermSchoolCourseListR tid ssh = do
   muid <- maybeAuthId
   let colonnade = widgetColonnade $ mconcat
         [ dbRow
-        , colCShortDescr
+        , colCShort
+        , colDescription
         , colRegFrom
         , colRegTo
         , colMembers
@@ -244,7 +245,8 @@ getTermCourseListR tid = do
   muid <- maybeAuthId
   let colonnade = widgetColonnade $ mconcat
         [ dbRow
-        , colCShortDescr
+        , colCShort
+        , colDescription
         , colSchoolShort
         , colRegFrom
         , colRegTo
diff --git a/test/Database.hs b/test/Database.hs
index 8cecdb70e..69ef0a541 100755
--- a/test/Database.hs
+++ b/test/Database.hs
@@ -218,9 +218,22 @@ fillDb = do
   repsert sdInf  $ StudyTerms  79 (Just "IfI") (Just "Institut für Informatik")
   repsert sdMath $ StudyTerms 105 (Just "MI" ) (Just "Mathematisches Institut")
   -- FFP
+  let nbrs :: [Int]
+      nbrs = [1,2,3,27,7,1]
   ffp <- insert' Course
     { courseName = "Fortgeschrittene Funktionale Programmierung"
-    , courseDescription = Just "<h2>It is fun!</h2>Come to where the functional is!"
+    , courseDescription = Just [shamlet|
+        <h2>It is fun!
+          <p>Come to where the functional is!
+          <section>
+            <h3>Functional programming can be done in Haskell!
+            <p>This is not a joke, this is serious!
+          <section>
+            <h3>Consider some numbers
+            <ul>
+              $forall n <- nbrs
+                <li>Number #{n}
+        |]
     , courseLinkExternal = Nothing
     , courseShorthand = "FFP"
     , courseTerm = TermKey summer2018