diff --git a/hledger-lib/Hledger/Utils.hs b/hledger-lib/Hledger/Utils.hs index 29f44f6ca..a80640c7a 100644 --- a/hledger-lib/Hledger/Utils.hs +++ b/hledger-lib/Hledger/Utils.hs @@ -58,7 +58,7 @@ strip = lstrip . rstrip lstrip = dropWhile (`elem` " \t") :: String -> String rstrip = reverse . lstrip . reverse -stripbrackets = dropWhile (`elem` "([") . reverse . dropWhile (`elem` "])") . reverse +stripbrackets = dropWhile (`elem` "([") . reverse . dropWhile (`elem` "])") . reverse :: String -> String elideLeft width s = if length s > width then ".." ++ reverse (take (width - 2) $ reverse s) else s diff --git a/hledger-web/Foundation.hs b/hledger-web/Foundation.hs index 2d45362ff..5421f73b6 100644 --- a/hledger-web/Foundation.hs +++ b/hledger-web/Foundation.hs @@ -102,10 +102,10 @@ instance Yesod App where $(widgetFile "normalize") addStylesheet $ StaticR css_bootstrap_css -- load jquery early: - toWidgetHead [hamlet| |] + toWidgetHead [hamlet| |] addScript $ StaticR jquery_url_js addScript $ StaticR jquery_flot_js - toWidget [hamlet| \ |] + toWidget [hamlet| \ |] addScript $ StaticR dhtmlxcommon_js addScript $ StaticR dhtmlxcombo_js addStylesheet $ StaticR style_css diff --git a/hledger-web/Handler/Common.hs b/hledger-web/Handler/Common.hs index 03eb70c0e..fa562e94f 100644 --- a/hledger-web/Handler/Common.hs +++ b/hledger-web/Handler/Common.hs @@ -109,12 +109,12 @@ searchform VD{..} = [hamlet| filtering = not $ null q -- | Add transaction form. -addform :: ViewData -> HtmlUrl AppRoute -addform vd@VD{..} = [hamlet| +addform :: Text -> ViewData -> HtmlUrl AppRoute +addform staticRootUrl vd@VD{..} = [hamlet|