From ec3ec2a88294a80d1917c605804df25d02d425af Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 13 Feb 2019 19:45:39 +0100 Subject: [PATCH] Move alerts to separate widget --- src/Foundation.hs | 2 ++ templates/default-layout.hamlet | 11 +---------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/Foundation.hs b/src/Foundation.hs index 0bb653360..eb0816fd6 100644 --- a/src/Foundation.hs +++ b/src/Foundation.hs @@ -961,6 +961,8 @@ siteLayout headingOverride widget = do asidenav = $(widgetFile "widgets/asidenav") footer :: Widget footer = $(widgetFile "widgets/footer") + alerts :: Widget + alerts = $(widgetFile "widgets/alerts/alerts") contentHeadline :: Maybe Widget contentHeadline = (toWidget <$> headingOverride) <|> (pageHeading =<< mcurrentRoute) breadcrumbsWgt :: Widget diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet index c01ab4e45..87870650b 100644 --- a/templates/default-layout.hamlet +++ b/templates/default-layout.hamlet @@ -30,16 +30,7 @@ $if not isModal ^{widget} - -
-
- $forall (status, msg) <- mmsgs - $with status2 <- bool status "info" (status == "") -
-
-
-
- #{msg} + ^{alerts} $if not isModal