From 7778a0b82138b5f86b8e8f0d2071ced1f4f893d4 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Thu, 22 May 2014 20:57:22 -0700
Subject: [PATCH] web: reorganise sidebar links

---
 hledger-web/Handler/Common.hs | 14 ++++----------
 hledger-web/static/style.css  |  2 +-
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/hledger-web/Handler/Common.hs b/hledger-web/Handler/Common.hs
index 5ab19ac46..8b14e0791 100644
--- a/hledger-web/Handler/Common.hs
+++ b/hledger-web/Handler/Common.hs
@@ -51,10 +51,10 @@ sidebar :: ViewData -> HtmlUrl AppRoute
 sidebar vd@VD{..} =
  [hamlet|
  <a#sidebar-toggle-link.togglelink href="#" title="Toggle sidebar">[+]
-
  <div#sidebar-content>
+
   <p style="margin-top:1em;">
-   <a href=@{RegisterR} title="Show current register">Register
+   <a#addformlink href="#" onclick="return addformToggle(event)" title="Add a new transaction to the journal" style="margin-top:1em;">Add a transaction..
 
   <p style="margin-top:1em;">
    <a href=@{JournalR} title="Show all transactions in journal format">Journal
@@ -66,9 +66,9 @@ sidebar vd@VD{..} =
      edit
 
   <p style="margin-top:1em;">
-   <a#addformlink href="#" onclick="return addformToggle(event)" title="Add a new transaction to the journal" style="margin-top:1em;">Add a transaction..
+   <a href=@{RegisterR} title="Show current register">Register
 
-  <div#accounts>
+  <div#accounts style="margin-top:.5em;">
    ^{accounts}
 |]
  where
@@ -314,14 +314,8 @@ balanceReportAsHtml :: WebOpts -> ViewData -> BalanceReport -> HtmlUrl AppRoute
 balanceReportAsHtml _ vd@VD{..} (items',total) =
  [hamlet|
  <table.balancereport>
-  <tr>
-   <td colspan=3>
-    <br>
-    Accounts
-
   $forall i <- items
    ^{itemAsHtml vd i}
-
   <tr.totalrule>
    <td colspan=3>
   <tr>
diff --git a/hledger-web/static/style.css b/hledger-web/static/style.css
index c591ed6b0..f77010c41 100644
--- a/hledger-web/static/style.css
+++ b/hledger-web/static/style.css
@@ -116,7 +116,7 @@ body                        { margin:0; }
 .balancereport tr           { vertical-align:bottom; border-spacing:0; }
 .balancereport .title       { white-space:nowrap; }
 .balancereport .item        { }
-.balancereport .depth0      { padding-top:1em; }
+/* .balancereport .depth0      { padding-top:1em; } */
 .balancereport td           { padding:0; }
 .totalrule td               { border-top:thin solid black; }
 .balancereport .account     { white-space:nowrap; }