From 805d50c69d40be97baa28735371778df63b5fed6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 25 Jul 2012 23:50:29 -0400 Subject: use hamlet at least for the static html --- Assistant/Threads/WebApp.hs | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/Assistant/Threads/WebApp.hs b/Assistant/Threads/WebApp.hs index f3f13c5a0..d475865dc 100644 --- a/Assistant/Threads/WebApp.hs +++ b/Assistant/Threads/WebApp.hs @@ -15,7 +15,10 @@ import Assistant.DaemonStatus import Utility.WebApp import Yesod +import Text.Hamlet import Network.Socket (PortNumber) +import Text.Blaze.Renderer.Utf8 +import Data.ByteString.Lazy as L data WebApp = WebApp DaemonStatusHandle @@ -45,20 +48,18 @@ webAppThread st dstatus = do writeHtmlShim :: PortNumber -> Annex () writeHtmlShim port = do htmlshim <- fromRepo gitAnnexHtmlShim - liftIO $ writeFile htmlshim $ genHtmlShim port + liftIO $ L.writeFile htmlshim $ genHtmlShim port {- TODO: generate this static file using Yesod. -} -genHtmlShim :: PortNumber -> String -genHtmlShim port = unlines - [ "" - , "" - , "" - , "" - , "" - , "

" - , "Starting webapp..." - , "

" - , "" - ] +genHtmlShim :: PortNumber -> L.ByteString +genHtmlShim port = renderHtml [shamlet| +!!! + + + + +

+ Starting webapp... +|] where url = "http://localhost:" ++ show port ++ "/" -- cgit v1.2.3