diff --git a/src/Foundation.hs b/src/Foundation.hs index 05b086ed0..452eaca2f 100644 --- a/src/Foundation.hs +++ b/src/Foundation.hs @@ -4,7 +4,7 @@ module Foundation where -import Import.NoFoundation +import Import.NoFoundation hiding (embedFile) import Database.Persist.Sql (ConnectionPool, runSqlPool) import Text.Hamlet (hamletFile) @@ -85,6 +85,8 @@ import Data.Bits (Bits(zeroBits)) import Network.Wai.Parse (lbsBackEnd) +import Data.FileEmbed (embedFile) + instance DisplayAble b => DisplayAble (E.CryptoID a b) where display = display . ciphertext @@ -1239,6 +1241,7 @@ siteLayout' headingOverride widget = do navbar = $(widgetFile "widgets/navbar/navbar") asidenav :: Widget asidenav = $(widgetFile "widgets/asidenav/asidenav") + where logo = preEscapedToMarkup $ decodeUtf8 $(embedFile "assets/logo.svg") footer :: Widget footer = $(widgetFile "widgets/footer/footer") alerts :: Widget diff --git a/templates/widgets/asidenav/asidenav.hamlet b/templates/widgets/asidenav/asidenav.hamlet index 2e72c4e7e..2c49a065d 100644 --- a/templates/widgets/asidenav/asidenav.hamlet +++ b/templates/widgets/asidenav/asidenav.hamlet @@ -3,12 +3,7 @@ $newline never
- $# TODO: logo is supposed to be loaded from /assets/logo.svg and placed here - - - - - + #{logo} UNI2WORK