slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

web: filterform -> searchform

Browse Source
This commit is contained in:
Simon Michael 2011-06-13 20:00:21 +00:00
parent ca1f061ec3
commit fb9fb50cfd
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hledger-web/.hledger/web/static/hledger.js
View File

@ -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');

10
hledger-web/.hledger/web/static/style.css
View File

@ -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; }
/*------------------------------------------------------------------------------------------*/

2
hledger-web/.hledger/web/templates/journal.hamlet
View File

@ -1,6 +1,6 @@
^{topbar vd}
<div#content
^{filterform vd}
^{searchform vd}
<div#sidebar
^{sidecontent}
<div#main.journal

2
hledger-web/.hledger/web/templates/register.hamlet
View File

@ -1,6 +1,6 @@
^{topbar vd}
<div#content
^{filterform vd}
^{searchform vd}
<div#sidebar
^{sidecontent}
<div#main.register

4
hledger-web/.hledger/web/templates/filterform.hamlet → hledger-web/.hledger/web/templates/searchform.hamlet
View File

@ -1,5 +1,5 @@
<div#filterformdiv
<form#filterform.form method=GET
<div#searchformdiv
<form#searchform.form method=GET
<table
<tr
<td

6
hledger-web/Handlers.hs
View File

@ -379,9 +379,9 @@ helplink :: String -> 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