diff --git a/hledger-web/.hledger/web/templates/balancereport.hamlet b/hledger-web/.hledger/web/templates/balancereport.hamlet index f30c91e9c..414ef4259 100644 --- a/hledger-web/.hledger/web/templates/balancereport.hamlet +++ b/hledger-web/.hledger/web/templates/balancereport.hamlet @@ -1,12 +1,12 @@ [+/-] + [+/-] all accounts + all accounts $forall i <- items ^{itemAsHtml vd i} diff --git a/hledger-web/.hledger/web/templates/balancereportitem.hamlet b/hledger-web/.hledger/web/templates/balancereportitem.hamlet index e705d41c6..3ce3ddbcd 100644 --- a/hledger-web/.hledger/web/templates/balancereportitem.hamlet +++ b/hledger-web/.hledger/web/templates/balancereportitem.hamlet @@ -10,4 +10,4 @@ -others --> #{mixedAmountAsHtml abal} - (#{numpostingsinacct acct}) + (#{numpostings}) diff --git a/hledger-web/.hledger/web/templates/editlinks.hamlet b/hledger-web/.hledger/web/templates/editlinks.hamlet index 52e451d0a..929ae838a 100644 --- a/hledger-web/.hledger/web/templates/editlinks.hamlet +++ b/hledger-web/.hledger/web/templates/editlinks.hamlet @@ -1,4 +1,4 @@ -edit +edit \ | # -add +add import transactions diff --git a/hledger-web/.hledger/web/templates/journal.hamlet b/hledger-web/.hledger/web/templates/journal.hamlet index 8b8087e60..253f17ea4 100644 --- a/hledger-web/.hledger/web/templates/journal.hamlet +++ b/hledger-web/.hledger/web/templates/journal.hamlet @@ -4,7 +4,7 @@ ^{sidecontent} #{s} \ No newline at end of file +#{s} diff --git a/hledger-web/.hledger/web/templates/register.hamlet b/hledger-web/.hledger/web/templates/register.hamlet index 7e9187e46..6f19c7754 100644 --- a/hledger-web/.hledger/web/templates/register.hamlet +++ b/hledger-web/.hledger/web/templates/register.hamlet @@ -4,7 +4,7 @@ ^{sidecontent} help + help $if filtering \ # #{version} - manual + manual

#{title} $maybe m <- msg #{m} diff --git a/hledger-web/Handlers.hs b/hledger-web/Handlers.hs index d37bd2480..d343c0fa8 100644 --- a/hledger-web/Handlers.hs +++ b/hledger-web/Handlers.hs @@ -350,8 +350,8 @@ topbar VD{j=j,msg=msg,today=today} = $(Settings.hamletFile "topbar") -- registerlink = navlink vd "postings" RegisterR -- | Navigation link, preserving parameters and possibly highlighted. -navlink :: ViewData -> String -> AppRoute -> Hamlet AppRoute -navlink VD{here=here,q=q} s dest = $(Settings.hamletFile "navlink") +navlink :: ViewData -> String -> AppRoute -> String -> Hamlet AppRoute +navlink VD{here=here,q=q} s dest title = $(Settings.hamletFile "navlink") where u = (dest, if null q then [] else [("q", pack q)]) style | dest == here = "navlinkcurrent" | otherwise = "navlink" :: Text