web: layout tweaks

This commit is contained in:
Simon Michael 2009-11-19 20:53:52 +00:00
parent 2cdc21959e
commit 9c410a50dd

View File

@ -188,7 +188,7 @@ hledgerpage env msgs title content =
</head> </head>
<body> <body>
<% navbar env %> <% navbar env %>
<span id="messages"><% intercalate ", " msgs %></span> <div id="messages"><% intercalate ", " msgs %></div>
<div id="content"><% content %></div> <div id="content"><% content %></div>
</body> </body>
</html> </html>
@ -196,8 +196,8 @@ hledgerpage env msgs title content =
navbar :: Hack.Env -> HSP XML navbar :: Hack.Env -> HSP XML
navbar env = navbar env =
<div id="navbar"> <div id="navbar">
<div style="float:right; text-align:right;"><% searchform env %></div>
<% navlinks env %> <% navlinks env %>
<% searchform env %>
</div> </div>
getParamOrNull p = fromMaybe "" `fmap` getParam p getParamOrNull p = fromMaybe "" `fmap` getParam p
@ -220,10 +220,10 @@ searchform env = do
a <- getParamOrNull "a" a <- getParamOrNull "a"
p <- getParamOrNull "p" p <- getParamOrNull "p"
let resetlink | null a && null p = <span></span> let resetlink | null a && null p = <span></span>
| otherwise = <span>[NBSP]<a href=u>reset</a></span> | otherwise = <span id="resetlink">[NBSP]<a href=u>reset</a></span>
where u = dropWhile (=='/') $ Hack.Contrib.Request.path env where u = dropWhile (=='/') $ Hack.Contrib.Request.path env
<form action="" id="searchform"> <form action="" id="searchform">
[NBSP]filter by:[NBSP]<input name="a" size="20" value=a [NBSP]account pattern:[NBSP]<input name="a" size="20" value=a
/>[NBSP][NBSP]reporting period:[NBSP]<input name="p" size="20" value=p /> />[NBSP][NBSP]reporting period:[NBSP]<input name="p" size="20" value=p />
<input type="submit" name="submit" value="filter" style="display:none" /> <input type="submit" name="submit" value="filter" style="display:none" />
<% resetlink %> <% resetlink %>
@ -234,19 +234,21 @@ addform env = do
let inputs = Hack.Contrib.Request.inputs env let inputs = Hack.Contrib.Request.inputs env
date = fromMaybe "" $ lookup "date" inputs date = fromMaybe "" $ lookup "date" inputs
desc = fromMaybe "" $ lookup "desc" inputs desc = fromMaybe "" $ lookup "desc" inputs
<form action="" id="addform" method="POST"> <div id="addform">
<form action="" method="POST">
<table border="0"> <table border="0">
<tr> <tr>
<td> <td>
Date: <input size="10" name="date" value=date />[NBSP] Date: <input size="15" name="date" value=date />[NBSP]
Description: <input size="40" name="desc" value=desc />[NBSP] Description: <input size="35" name="desc" value=desc />[NBSP]
</td> </td>
</tr> </tr>
<% transactionfields 1 env %> <% transactionfields 1 env %>
<% transactionfields 2 env %> <% transactionfields 2 env %>
<tr align="right"><td><input type="submit" value="add" /></td></tr> <tr align="right"><td><input type="submit" value="add transaction" /></td></tr>
</table> </table>
</form> </form>
</div>
transactionfields :: Int -> Hack.Env -> HSP XML transactionfields :: Int -> Hack.Env -> HSP XML
transactionfields n env = do transactionfields n env = do
@ -256,8 +258,8 @@ transactionfields n env = do
<tr> <tr>
<td> <td>
[NBSP][NBSP] [NBSP][NBSP]
Account: <input size="40" name=acctvar value=acct />[NBSP] Account: <input size="35" name=acctvar value=acct />[NBSP]
Amount: <input size="10" name=amtvar value=amt />[NBSP] Amount: <input size="15" name=amtvar value=amt />[NBSP]
</td> </td>
</tr> </tr>
where where