From 6edc4d4a998455aa827442f29b701b6a8e2b592b Mon Sep 17 00:00:00 2001 From: Felix Hamann Date: Sun, 25 Mar 2018 23:43:22 +0200 Subject: [PATCH] added page action bar for prime actions closes #34 --- src/Foundation.hs | 8 ++++++++ src/Handler/Course.hs | 2 +- src/Handler/Term.hs | 2 +- templates/default-layout.hamlet | 3 +++ templates/default-layout.lucius | 1 + templates/widgets/asidenav.hamlet | 7 +------ templates/widgets/navbar.hamlet | 1 + templates/widgets/pageactionprime.hamlet | 11 +++++++++++ templates/widgets/pageactionprime.lucius | 21 +++++++++++++++++++++ 9 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 templates/widgets/pageactionprime.hamlet create mode 100644 templates/widgets/pageactionprime.lucius diff --git a/src/Foundation.hs b/src/Foundation.hs index 50b84b6d8..f3ed446e6 100644 --- a/src/Foundation.hs +++ b/src/Foundation.hs @@ -399,6 +399,14 @@ defaultMenuLayout menu widget = do asidenav = $(widgetFile "widgets/asidenav") breadcrumbs :: Widget breadcrumbs = $(widgetFile "widgets/breadcrumbs") + pageactionprime :: Widget + pageactionprime = $(widgetFile "widgets/pageactionprime") + -- functions to determine if there are page-actions + isPageActionPrime :: MenuTypes -> Bool + isPageActionPrime (PageActionPrime _) = True + isPageActionPrime _ = False + hasPageActions :: Bool + hasPageActions = any isPageActionPrime menuTypes pc <- widgetToPageContent $ do addStylesheetRemote "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,800,900" diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs index 4a7a36623..88e2c6218 100644 --- a/src/Handler/Course.hs +++ b/src/Handler/Course.hs @@ -64,7 +64,7 @@ getCourseListTermR tidini = do ) ] let pageLinks = - [ NavbarAside $ MenuItem + [ PageActionPrime $ MenuItem { menuItemLabel = "Neuer Kurs" , menuItemIcon = Just "book" , menuItemRoute = CourseNewR diff --git a/src/Handler/Term.hs b/src/Handler/Term.hs index 7093e5ce8..f8155da8c 100644 --- a/src/Handler/Term.hs +++ b/src/Handler/Term.hs @@ -76,7 +76,7 @@ getTermShowR = do , dbtIdent = "terms" :: Text } let pageActions = - [ NavbarAside $ MenuItem + [ PageActionPrime $ MenuItem { menuItemLabel = "Neues Semester" , menuItemIcon = Nothing , menuItemRoute = TermEditR diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet index 64ec8c8f1..b628912f0 100644 --- a/templates/default-layout.hamlet +++ b/templates/default-layout.hamlet @@ -13,5 +13,8 @@ $with status2 <- bool status "info" (status == "")
#{msg} + + ^{pageactionprime} + ^{widget} diff --git a/templates/default-layout.lucius b/templates/default-layout.lucius index 315ce9052..203487635 100644 --- a/templates/default-layout.lucius +++ b/templates/default-layout.lucius @@ -25,6 +25,7 @@ --lighterbase: #5F98C2; --whitebase: #FCFFFA; --greybase: #B1B5C0; + --lightgreybase: #D9DEDB; --blackbase: #1A2A36; --fontbase: #34303a; --fontsec: #5b5861; diff --git a/templates/widgets/asidenav.hamlet b/templates/widgets/asidenav.hamlet index f28f3337d..8676c0893 100644 --- a/templates/widgets/asidenav.hamlet +++ b/templates/widgets/asidenav.hamlet @@ -1,3 +1,4 @@ +$newline never