diff --git a/package.yaml b/package.yaml index 2f3f2baf4..190bfb3d7 100644 --- a/package.yaml +++ b/package.yaml @@ -50,6 +50,7 @@ dependencies: - base64-bytestring - memory - http-api-data +- profunctors - colonnade >=1.1.1 - yesod-colonnade >=1.1.0 - blaze-markup diff --git a/src/Handler/Term.hs b/src/Handler/Term.hs index 892cd258e..df382feb2 100644 --- a/src/Handler/Term.hs +++ b/src/Handler/Term.hs @@ -28,6 +28,7 @@ getShowTermsR = do , headed "Beginn Vorlesungen" $ fromString.formatTimeGerWD.termLectureStart , headed "Ende Vorlesungen" $ fromString.formatTimeGerWD.termLectureEnd , headed "Aktiv" (\t -> if termActive t then tickmark else "") +-- , Colonnade.bool (Headed "Aktiv") termActive (const tickmark) (const "") , headed "Semesteranfang" $ fromString.formatTimeGerWD.termStart , headed "Semesterende" $ fromString.formatTimeGerWD.termEnd , headed "Feiertage im Semester" $ diff --git a/src/Handler/Utils/Table.hs b/src/Handler/Utils/Table.hs index 5f532a1de..8277c9cfc 100644 --- a/src/Handler/Utils/Table.hs +++ b/src/Handler/Utils/Table.hs @@ -4,11 +4,22 @@ module Handler.Utils.Table where -- General Utilities for Tables --- import Import hiding ((<>)) +import Import hiding ((<>)) import Data.Monoid ((<>)) +import Data.Profunctor import Text.Blaze as B +import Colonnade +import Yesod.Colonnade + + -- Table design tableDefault :: Attribute -tableDefault = customAttribute "class" "table table-striped" +tableDefault = customAttribute "class" "table table-striped table-hover" + + +-- modifiy tables +encodeHeadedWidgetTableNumbered :: Attribute -> Colonnade Headed a (WidgetT site IO ()) -> [a] -> WidgetT site IO () +encodeHeadedWidgetTableNumbered attrs colo tdata = + encodeHeadedWidgetTable attrs (mconcat [headed "Nr" (fromString.show.fst), lmap snd colo]) (zip [1..] tdata)