From df4b43a2b3f07f6d60701e46cb0634440c0c1c78 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Sun, 27 Sep 2015 10:05:20 -1000
Subject: [PATCH] web: fix journal/register links with --base-url (#235)

---
 hledger-web/Handler/JournalR.hs  | 4 +++-
 hledger-web/Handler/RegisterR.hs | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hledger-web/Handler/JournalR.hs b/hledger-web/Handler/JournalR.hs
index e426c55b8..fa2cca24a 100644
--- a/hledger-web/Handler/JournalR.hs
+++ b/hledger-web/Handler/JournalR.hs
@@ -3,6 +3,7 @@
 
 module Handler.JournalR where
 
+import Data.Text (pack)
 import Import
 
 import Handler.AddForm
@@ -71,7 +72,7 @@ $forall p' <- tpostings t
   <td.description>
   <td.account>
    &nbsp;
-   <a href="/register?q=inacct:'#{paccount p'}'##{date}" title="#{paccount p'}">#{elideAccountName 40 $ paccount p'}
+   <a href="@?{acctlink (paccount p')}##{date}" title="#{paccount p'}">#{elideAccountName 40 $ paccount p'}
   <td.amount style="text-align:right;">#{mixedAmountAsHtml $ pamount p'}
 <tr.#{evenodd}>
  <td>&nbsp;
@@ -80,6 +81,7 @@ $forall p' <- tpostings t
  <td>
 |]
      where
+       acctlink a = (RegisterR, [("q", pack $ accountQuery a)])
        evenodd = if even n then "even" else "odd" :: String
        -- datetransition | newm = "newmonth"
        --                | newd = "newday"
diff --git a/hledger-web/Handler/RegisterR.hs b/hledger-web/Handler/RegisterR.hs
index 6996ee726..64678be93 100644
--- a/hledger-web/Handler/RegisterR.hs
+++ b/hledger-web/Handler/RegisterR.hs
@@ -74,7 +74,7 @@ registerItemsHtml _ vd (balancelabel,items) = [hamlet|
    itemAsHtml VD{..} (n, newd, newm, _, (torig, tacct, split, acct, amt, bal)) = [hamlet|
 
 <tr ##{date} .item.#{evenodd}.#{firstposting}.#{datetransition} title="#{show torig}" style="vertical-align:top;">
- <td.date><a href="/journal##{date}">#{date}
+ <td.date><a href="@{JournalR}##{date}">#{date}
  <td.description title="#{show torig}">#{elideRight 30 desc}
  <td.account>#{elideRight 40 acct}
  <td.amount style="text-align:right; white-space:nowrap;">