From 18bf123eae5de3817235c39147cabb9b9886af93 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Thu, 8 Jul 2010 02:05:34 +0000 Subject: [PATCH] webyesod: small cleanups --- Hledger/Cli/Commands/Web.hs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Hledger/Cli/Commands/Web.hs b/Hledger/Cli/Commands/Web.hs index b16d4dddc..7596c937b 100644 --- a/Hledger/Cli/Commands/Web.hs +++ b/Hledger/Cli/Commands/Web.hs @@ -44,7 +44,11 @@ web opts args j = do server url port opts args j browser :: String -> IO () -browser url = putStrLn "starting web browser" >> threadDelay browserstartdelay >> openBrowserOn url >> return () +browser url = do + putStrLn "starting web browser" + threadDelay browserstartdelay + openBrowserOn url + return () server :: String -> Int -> [Opt] -> [String] -> Journal -> IO () server url port opts args j = do @@ -57,7 +61,7 @@ server url port opts args j = do ,appWebdir=fp ,appRoot=url } - withStore "hledger" $ do -- IO () + withStore "hledger" $ do putValue "hledger" "journal" j toWaiApp app >>= run port @@ -174,10 +178,10 @@ navlinks a p = [$hamlet| searchform :: HledgerWebAppRoutes -> String -> String -> Hamlet HledgerWebAppRoutes searchform here a p = [$hamlet| %form#searchform - search for: $ + filter by: $ %input!name=a!size=20!value=$string.a$ ^ahelp^ $ - in reporting period: $ + in period: $ %input!name=p!size=20!value=$string.p$ ^phelp^ $ %input!name=submit!type=submit!value=filter!style=display:none; @@ -266,7 +270,7 @@ transactionfields n = [$hamlet| %input!size=15!name=$string.amtvar$!value=$string.amt$ |] | otherwise = nulltemplate - amthelp | n == 1 = "eg: 5, $9.01, €7" -- XXX , £75 <- misencoded + amthelp | n == 1 = "eg: 5, $6, €7.01" | otherwise = "" acct = "" amt = ""