From fb9fb50cfdd1741e17016388ab4fb3892ded3ef4 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Mon, 13 Jun 2011 20:00:21 +0000 Subject: [PATCH] web: filterform -> searchform --- hledger-web/.hledger/web/static/hledger.js | 18 +++++++++--------- hledger-web/.hledger/web/static/style.css | 10 +++++----- .../.hledger/web/templates/journal.hamlet | 2 +- .../.hledger/web/templates/register.hamlet | 2 +- .../{filterform.hamlet => searchform.hamlet} | 4 ++-- hledger-web/Handlers.hs | 6 +++--- 6 files changed, 21 insertions(+), 21 deletions(-) rename hledger-web/.hledger/web/templates/{filterform.hamlet => searchform.hamlet} (92%) diff --git a/hledger-web/.hledger/web/static/hledger.js b/hledger-web/.hledger/web/static/hledger.js index db7f9a05c..da5f1394e 100644 --- a/hledger-web/.hledger/web/static/hledger.js +++ b/hledger-web/.hledger/web/static/hledger.js @@ -9,15 +9,15 @@ $(document).ready(function() { }); -function filterformToggle() { +function searchformToggle() { var a = document.getElementById('addform'); var e = document.getElementById('editform'); - var f = document.getElementById('filterform'); + var f = document.getElementById('searchform'); var i = document.getElementById('importform'); var c = document.getElementById('maincontent'); var alink = document.getElementById('addformlink'); var elink = document.getElementById('editformlink'); - var flink = document.getElementById('filterformlink'); + var flink = document.getElementById('searchformlink'); var ilink = document.getElementById('importformlink'); var jlink = document.getElementById('journallink'); var rlink = document.getElementById('registerlink'); @@ -35,12 +35,12 @@ function filterformToggle() { function addformToggle(ev) { var a = document.getElementById('addform'); var e = document.getElementById('editform'); - var f = document.getElementById('filterform'); + var f = document.getElementById('searchform'); var i = document.getElementById('importform'); var c = document.getElementById('maincontent'); var alink = document.getElementById('addformlink'); var elink = document.getElementById('editformlink'); - var flink = document.getElementById('filterformlink'); + var flink = document.getElementById('searchformlink'); var ilink = document.getElementById('importformlink'); var jlink = document.getElementById('journallink'); var rlink = document.getElementById('registerlink'); @@ -71,12 +71,12 @@ function editformToggle(ev) { var a = document.getElementById('addform'); var e = document.getElementById('editform'); var ej = document.getElementById('journalselect'); - var f = document.getElementById('filterform'); + var f = document.getElementById('searchform'); var i = document.getElementById('importform'); var c = document.getElementById('maincontent'); var alink = document.getElementById('addformlink'); var elink = document.getElementById('editformlink'); - var flink = document.getElementById('filterformlink'); + var flink = document.getElementById('searchformlink'); var ilink = document.getElementById('importformlink'); var jlink = document.getElementById('journallink'); var rlink = document.getElementById('registerlink'); @@ -131,12 +131,12 @@ function editformJournalSelect(ev) { function importformToggle(ev) { var a = document.getElementById('addform'); var e = document.getElementById('editform'); - var f = document.getElementById('filterform'); + var f = document.getElementById('searchform'); var i = document.getElementById('importform'); var c = document.getElementById('maincontent'); var alink = document.getElementById('addformlink'); var elink = document.getElementById('editformlink'); - var flink = document.getElementById('filterformlink'); + var flink = document.getElementById('searchformlink'); var ilink = document.getElementById('importformlink'); var jlink = document.getElementById('journallink'); var rlink = document.getElementById('registerlink'); diff --git a/hledger-web/.hledger/web/static/style.css b/hledger-web/.hledger/web/static/style.css index eac4a7fa7..f6a51aa3f 100644 --- a/hledger-web/.hledger/web/static/style.css +++ b/hledger-web/.hledger/web/static/style.css @@ -33,7 +33,7 @@ pre { font-family:courier,"courie input.textinput, .dhx_combo_input, .dhx_combo_list { font-size:small; } #editform textarea { font-family:courier,"courier new",monospace; font-size:small; } .nav2 { font-size:small; } -#filterform { font-size:small; } +#searchform { font-size:small; } .topleftlink { font-size:small; } .toprightlink { font-size:small; } #journaldesc { font-size:small; } @@ -72,9 +72,9 @@ body { margin:0; } .navlinkcurrent { font-weight:bold; } .form { margin:0em; } -#filterformdiv { margin:0 0 1em 0; white-space:nowrap; } -#filterform { margin:0; } -#filterform span { padding:4px; } +#searchformdiv { margin:0 0 1em 0; white-space:nowrap; } +#searchform { margin:0; } +#searchform span { padding:4px; } #stopfilterlink { font-weight:bold; } .filtering { font-weight:bold; } @@ -116,7 +116,7 @@ tr.newmonth td { border-top: 2px solid black; } #addform #addbuttonrow { text-align:right; } /* #editform { width:95%; } */ #editform textarea { width:100%; padding:4px; } -#filterform table { border-spacing:0; padding-left:0em; } +#searchform table { border-spacing:0; padding-left:0em; } /*------------------------------------------------------------------------------------------*/ diff --git a/hledger-web/.hledger/web/templates/journal.hamlet b/hledger-web/.hledger/web/templates/journal.hamlet index 1b177ed78..d8128bfa0 100644 --- a/hledger-web/.hledger/web/templates/journal.hamlet +++ b/hledger-web/.hledger/web/templates/journal.hamlet @@ -1,6 +1,6 @@ ^{topbar vd} String -> Hamlet AppRoute helplink topic label = $(Settings.hamletFile "helplink") where u = manualurl ++ if null topic then "" else '#':topic --- | Form controlling journal filtering parameters. -filterform :: ViewData -> Hamlet AppRoute -filterform VD{here=here,q=q} = $(Settings.hamletFile "filterform") +-- | Search form for entering custom queries to filter journal data. +searchform :: ViewData -> Hamlet AppRoute +searchform VD{here=here,q=q} = $(Settings.hamletFile "searchform") where filtering = not $ null q