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

web: use/show full file paths in add form (#234)

Browse Source
This commit is contained in:
Simon Michael 2015-02-17 23:23:49 +00:00
parent 9351f10b81
commit 8bde2fd212
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hledger-web/Foundation.hs
View File

@ -37,7 +37,6 @@ import Data.List
import Data.Maybe import Data.Maybe
import Data.Text as Text (Text,pack,unpack) import Data.Text as Text (Text,pack,unpack)
import Data.Time.Calendar import Data.Time.Calendar
import System.FilePath (takeFileName)
#if BLAZE_HTML_0_4 #if BLAZE_HTML_0_4
import Text.Blaze (preEscapedString) import Text.Blaze (preEscapedString)
#else #else
@ -370,22 +369,31 @@ addform _ vd@VD{..} = [hamlet|
|] |]
| otherwise = [hamlet| | otherwise = [hamlet|
<td #addbtncell style="text-align:right;"> <td #addbtncell style="text-align:right;">
<input type=hidden name=action value=add>
<button type=submit .btn .btn-lg name=submit>add <button type=submit .btn .btn-lg name=submit>add
$if length files' > 1 $if length filepaths > 1
<br>to: ^{journalselect files'} <br>
<span class="input-lg">to:
^{journalselect filepaths}
|] |]
where where
amtvar = "amount" ++ show n amtvar = "amount" ++ show n
amtph = "Amount " ++ show n amtph = "Amount " ++ show n
files' = [(takeFileName f,s) | (f,s) <- files j] filepaths = map fst $ files j
-- <button .btn style="font-size:18px;" type=submit title="Add this transaction">Add -- <button .btn style="font-size:18px;" type=submit title="Add this transaction">Add
journalselect :: [(FilePath,String)] -> HtmlUrl AppRoute journalselect :: [FilePath] -> HtmlUrl AppRoute
journalselect journalfiles = [hamlet| journalselect journalfilepaths = [hamlet|
<select id=journalselect name=journal onchange="/*journalSelect(event)*/"> <select id=journalselect name=journal onchange="/*journalSelect(event)*/" class="form-control input-lg" style="width:auto; display:inline-block;">
$forall f <- journalfiles $forall p <- journalfilepaths
<option value=#{fst f}>#{fst f} <option value=#{p}>#{p}
|]
journalradio :: [FilePath] -> HtmlUrl AppRoute
journalradio journalfilepaths = [hamlet|
$forall p <- journalfilepaths
<div style="white-space:nowrap;">
<span class="input-lg" style="position:relative; top:-8px; left:8px;">#{p}
<input name=journal type=radio value=#{p} class="form-control" style="width:auto; display:inline;">
|] |]