From 5f9a3aba522dbf56247a118c64e6f452755a954b Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Fri, 3 Jun 2011 22:56:24 +0000
Subject: [PATCH] web: hacky changes towards simplifying the web ui

---
 hledger-web/.hledger/web/static/style.css     |  2 +-
 .../.hledger/web/templates/editlinks.hamlet   |  4 ++--
 .../.hledger/web/templates/filterform.hamlet  | 19 +++----------------
 .../.hledger/web/templates/journal.hamlet     |  2 +-
 .../.hledger/web/templates/navlinks.hamlet    |  2 --
 .../.hledger/web/templates/register.hamlet    |  2 +-
 hledger-web/Handlers.hs                       |  8 ++++----
 hledger-web/hledger-web.hs                    |  2 +-
 8 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/hledger-web/.hledger/web/static/style.css b/hledger-web/.hledger/web/static/style.css
index 55987638a..7ef63a575 100644
--- a/hledger-web/.hledger/web/static/style.css
+++ b/hledger-web/.hledger/web/static/style.css
@@ -4,7 +4,7 @@
 /* 1. colours */
 
 /* green */
-body                                                                 { background-color:#efe; }
+body                                                                 { background-color:; }
 .registerreport .odd                                                 { background-color:#ded; }
 .filtering                                                           { background-color:#ded; }
 /* #main                                                                { border-color:#ded; } see below */
diff --git a/hledger-web/.hledger/web/templates/editlinks.hamlet b/hledger-web/.hledger/web/templates/editlinks.hamlet
index 0a63031bc..824ad8990 100644
--- a/hledger-web/.hledger/web/templates/editlinks.hamlet
+++ b/hledger-web/.hledger/web/templates/editlinks.hamlet
@@ -1,4 +1,4 @@
-<a#addformlink href onclick="return addformToggle(event)">add transaction
+<a#addformlink href onclick="return addformToggle(event)">add
 <a#importformlink href onclick="return importformToggle(event)" style="display:none;">import transactions
 \ | #
-<a#editformlink href onclick="return editformToggle(event)">edit journal
+<a#editformlink href onclick="return editformToggle(event)">edit
diff --git a/hledger-web/.hledger/web/templates/filterform.hamlet b/hledger-web/.hledger/web/templates/filterform.hamlet
index 8c2f3f825..99a00641a 100644
--- a/hledger-web/.hledger/web/templates/filterform.hamlet
+++ b/hledger-web/.hledger/web/templates/filterform.hamlet
@@ -3,23 +3,10 @@
   <table.form
    <tr.#{filteringperiodclass}
     <td
-     filter by period:
+     Search:
      \ #
     <td
-     <input name=p size=60 value=#{p}
-     ^{phelp}
-     \ #
-    <td align=right
-     ^{stopfilteringperiod}
-   <tr.#{filteringclass}
-    <td
-     filter by account/description:
-     \ #
-    <td
-     <input name=a size=60 value=#{a}
-     ^{ahelp}
-     \ #
-     <input type=submit value=filter #
-     \ #
+     <input name=a size=100 value=#{a}
+     \#
     <td align=right
      ^{stopfiltering}
diff --git a/hledger-web/.hledger/web/templates/journal.hamlet b/hledger-web/.hledger/web/templates/journal.hamlet
index ea94c43e4..1b177ed78 100644
--- a/hledger-web/.hledger/web/templates/journal.hamlet
+++ b/hledger-web/.hledger/web/templates/journal.hamlet
@@ -1,11 +1,11 @@
 ^{topbar vd}
 <div#content
+ ^{filterform vd}
  <div#sidebar
   ^{sidecontent}
  <div#main.journal
   ^{navlinks vd}
   <div#maincontent
-   ^{filterform vd}
    ^{maincontent}
   ^{addform vd}
   ^{editform vd}
diff --git a/hledger-web/.hledger/web/templates/navlinks.hamlet b/hledger-web/.hledger/web/templates/navlinks.hamlet
index c892007fc..5b9fdfc99 100644
--- a/hledger-web/.hledger/web/templates/navlinks.hamlet
+++ b/hledger-web/.hledger/web/templates/navlinks.hamlet
@@ -1,6 +1,4 @@
 <div#navlinks
- ^{accountsjournallink}
- \ | #
  ^{accountsregisterlink}
  \ | #
  ^{editlinks}
diff --git a/hledger-web/.hledger/web/templates/register.hamlet b/hledger-web/.hledger/web/templates/register.hamlet
index 293d79618..e6768939a 100644
--- a/hledger-web/.hledger/web/templates/register.hamlet
+++ b/hledger-web/.hledger/web/templates/register.hamlet
@@ -1,11 +1,11 @@
 ^{topbar vd}
 <div#content
+ ^{filterform vd}
  <div#sidebar
   ^{sidecontent}
  <div#main.register
   ^{navlinks vd}
   <div#maincontent
-   ^{filterform vd}
    ^{maincontent}
   ^{addform vd}
   ^{editform vd}
diff --git a/hledger-web/Handlers.hs b/hledger-web/Handlers.hs
index 5a8fd1564..4349df0b2 100644
--- a/hledger-web/Handlers.hs
+++ b/hledger-web/Handlers.hs
@@ -46,7 +46,7 @@ getRobotsR :: Handler RepPlain
 getRobotsR = return $ RepPlain $ toContent ("User-agent: *" :: ByteString)
 
 getRootR :: Handler RepHtml
-getRootR = redirect RedirectTemporary defaultroute where defaultroute = JournalR
+getRootR = redirect RedirectTemporary defaultroute where defaultroute = RegisterR
 
 ----------------------------------------------------------------------
 -- main views
@@ -322,8 +322,8 @@ journalTitleDesc j p today = (title, desc)
 navlinks :: ViewData -> Hamlet AppRoute
 navlinks vd = $(Settings.hamletFile "navlinks")
  where
-   accountsjournallink  = navlink vd "journal" JournalR
-   accountsregisterlink = navlink vd "register" RegisterR
+   accountsjournallink  = navlink vd "transactions" JournalR
+   accountsregisterlink = navlink vd "postings" RegisterR
    navlink :: ViewData -> String -> AppRoute -> Hamlet AppRoute
    navlink VD{here=here,a=a,p=p} s dest = $(Settings.hamletFile "navlink")
     where u = (dest, concat [(if null a then [] else [("a", pack a)])
@@ -401,7 +401,7 @@ journalselect journalfiles = $(Settings.hamletFile "journalselect")
 -- utilities
 
 nulltemplate :: Hamlet AppRoute
-nulltemplate = [$hamlet||]
+nulltemplate = [hamlet||]
 
 -- | A bundle of data useful for handlers and their templates.
 data ViewData = VD {
diff --git a/hledger-web/hledger-web.hs b/hledger-web/hledger-web.hs
index 3457d44af..2b99eab38 100644
--- a/hledger-web/hledger-web.hs
+++ b/hledger-web/hledger-web.hs
@@ -19,7 +19,7 @@ import Network.Wai.Middleware.Debug (debug)
 #endif
 import System.Console.GetOpt
 import System.Exit (exitFailure)
-import System.IO.Storage (withStore, putValue,)
+import System.IO.Storage (withStore, putValue)
 import Text.Printf
 import Yesod.Helpers.Static