From 353245c65fbac0ea644eee07d0e5cbb1fc5669bb Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sat, 7 Jul 2018 22:16:22 +0200 Subject: [PATCH] Generate headings for favourite-bar from content Fixes #105 --- messages/de.msg | 2 ++ src/Foundation.hs | 4 ++++ templates/widgets/asidenav.hamlet | 36 +++++++++++++++++-------------- 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/messages/de.msg b/messages/de.msg index d78acf450..1d542a5ff 100644 --- a/messages/de.msg +++ b/messages/de.msg @@ -10,6 +10,8 @@ DeRegUntil: Abmeldungen bis SummerTerm year@Integer: Sommersemester #{display year} WinterTerm year@Integer: Wintersemester #{display year}/#{display $ succ year} +SummerTermShort year@Integer: SoSe #{display year} +WinterTermShort year@Integer: WiSe #{display year}/#{display $ succ year} PSLimitNonPositive: “pagesize” muss größer als null sein Page n@Int64: #{display n} diff --git a/src/Foundation.hs b/src/Foundation.hs index 3aed4a208..1544e03cb 100644 --- a/src/Foundation.hs +++ b/src/Foundation.hs @@ -487,6 +487,10 @@ instance Yesod UniWorX where actFav = List.intersect (snd3 <$> favourites) crumbs highRs = if null actFav then crumbs else actFav in \r -> r `elem` highRs + favouriteTerms :: [TermIdentifier] + favouriteTerms = Set.toDescList $ foldMap (\(Course{..}, _, _) -> Set.singleton $ unTermKey courseTerm) favourites + favouriteTerm :: TermIdentifier -> [(Course, Route UniWorX, [MenuTypes])] + favouriteTerm tid = filter (\(Course{..}, _, _) -> unTermKey courseTerm == tid) favourites -- We break up the default layout into two components: -- default-layout is the contents of the body tag, and diff --git a/templates/widgets/asidenav.hamlet b/templates/widgets/asidenav.hamlet index ec1a8ea8b..8591ee9fe 100644 --- a/templates/widgets/asidenav.hamlet +++ b/templates/widgets/asidenav.hamlet @@ -2,19 +2,23 @@ $newline never