X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=Lucu.git;a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FDefaultPage.hs;h=dbc3835d6bbd8e5e7362426c900c81d736771278;hp=dea56b331df71a19807e043f31a7fa85f8338911;hb=5477896;hpb=8510a3765130fb171c06b448c50a74e65ac8ae11 diff --git a/Network/HTTP/Lucu/DefaultPage.hs b/Network/HTTP/Lucu/DefaultPage.hs index dea56b3..dbc3835 100644 --- a/Network/HTTP/Lucu/DefaultPage.hs +++ b/Network/HTTP/Lucu/DefaultPage.hs @@ -17,14 +17,12 @@ import Control.Arrow.Unicode import Control.Concurrent.STM import Control.Monad import qualified Data.Ascii as A -import qualified Data.ByteString.Char8 as C8 import Data.Maybe import qualified Data.Sequence as S import Data.Text (Text) import qualified Data.Text as T import Data.Text.Encoding import Network.HTTP.Lucu.Config -import Network.HTTP.Lucu.Format import Network.HTTP.Lucu.Headers import Network.HTTP.Lucu.Interaction import Network.HTTP.Lucu.Request @@ -63,21 +61,21 @@ writeDefaultPage !itr mkDefaultPage ∷ (ArrowXml a) ⇒ Config → StatusCode → a b XmlTree → a b XmlTree {-# INLINEABLE mkDefaultPage #-} mkDefaultPage !conf !status !msgA - = let (# sCode, sMsg #) = statusCode status - sig = concat [ A.toString (cnfServerSoftware conf) - , " at " - , T.unpack (cnfServerHost conf) - ] + = let sStr = A.toString $ printStatusCode status + sig = concat [ A.toString (cnfServerSoftware conf) + , " at " + , T.unpack (cnfServerHost conf) + ] in ( eelem "/" += ( eelem "html" += sattr "xmlns" "http://www.w3.org/1999/xhtml" += ( eelem "head" += ( eelem "title" - += txt (fmtDec 3 sCode ⧺ " " ⧺ C8.unpack sMsg) + += txt sStr )) += ( eelem "body" += ( eelem "h1" - += txt (C8.unpack sMsg) + += txt sStr ) += ( eelem "p" += msgA ) += eelem "hr"