diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-07-25 23:50:29 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-07-25 23:50:29 -0400 |
| commit | 805d50c69d40be97baa28735371778df63b5fed6 (patch) | |
| tree | d0bb7b3cb405c9e0ee5424c179457568cb2fe3da | |
| parent | 81b40cf882e50be4d996fd40d045039de94784ef (diff) | |
use hamlet at least for the static html
| -rw-r--r-- | Assistant/Threads/WebApp.hs | 27 |
1 files 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 - [ "<html>" - , "<head>" - , "<meta http-equiv=\"refresh\" content=\"0; URL=" ++ url ++ "\">" - , "</head>" - , "<body>" - , "<p>" - , "<a href=\"" ++ url ++ "\">Starting webapp...</a>" - , "</p>" - , "</body>" - ] +genHtmlShim :: PortNumber -> L.ByteString +genHtmlShim port = renderHtml [shamlet| +!!! +<html> + <head> + <meta http-equiv="refresh" content="0; URL=#{url}"> + <body> + <p> + <a href="#{url}">Starting webapp... +|] where url = "http://localhost:" ++ show port ++ "/" |