diff --git a/hledger-web/Handler/JournalR.hs b/hledger-web/Handler/JournalR.hs index 716c97429..e155481d0 100644 --- a/hledger-web/Handler/JournalR.hs +++ b/hledger-web/Handler/JournalR.hs @@ -35,9 +35,9 @@ getJournalR = do maincontent = journalTransactionsReportAsHtml opts vd $ journalTransactionsReport (reportopts_ $ cliopts_ opts) j m hledgerLayout vd "journal" [hamlet|
- #{title} +

#{title} - Add a transaction + Add a transaction
^{maincontent} |] @@ -50,11 +50,11 @@ journalTransactionsReportAsHtml :: WebOpts -> ViewData -> TransactionsReport -> journalTransactionsReportAsHtml _ vd (_,items) = [hamlet| - + - +
Date - Description - Account - Amount + Description + Account + Amount $forall i <- numberTransactionsReportItems items ^{itemAsHtml vd i} |] @@ -75,7 +75,7 @@ $forall p' <- tpostings torig   #{elideAccountName 40 $ paccount p'} - #{mixedAmountAsHtml $ pamount p'} + #{mixedAmountAsHtml $ pamount p'} |] where acctlink a = (RegisterR, [("q", T.pack $ accountQuery a)]) diff --git a/hledger-web/Handler/RegisterR.hs b/hledger-web/Handler/RegisterR.hs index 444523edc..f868ee1bb 100644 --- a/hledger-web/Handler/RegisterR.hs +++ b/hledger-web/Handler/RegisterR.hs @@ -37,7 +37,7 @@ getRegisterR = do s2 = if filtering then ", filtered" else "" maincontent = registerReportHtml opts vd $ accountTransactionsReport (reportopts_ $ cliopts_ opts) j m $ fromMaybe Any $ inAccountQuery qopts hledgerLayout vd "register" [hamlet| - #{title} +

#{title} ^{maincontent} |] @@ -79,14 +79,14 @@ registerItemsHtml _ vd (balancelabel,items) = [hamlet| itemAsHtml VD{..} (n, newd, newm, _, (torig, tacct, split, acct, amt, bal)) = [hamlet|

#{date} - #{textElideRight 30 desc} - #{elideRight 40 acct} - + #{textElideRight 30 desc} + #{elideRight 40 acct} + $if showamt \#{mixedAmountAsHtml amt} - #{mixedAmountAsHtml bal} + #{mixedAmountAsHtml bal} |] where @@ -109,8 +109,8 @@ registerChartHtml percommoditytxnreports = -- have to make sure plot is not called when our container (maincontent) -- is hidden, eg with add form toggled [hamlet| -
- +