From 4a7ad122712532228285b974f167789e7a316f0e Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Sat, 27 Nov 2010 01:08:22 +0000 Subject: [PATCH] web: hide run-time hamlet experiments for now --- .../.hledger/{web => unused}/addform.hamlet | 4 +++- .../addformpostingfields.hamlet | 0 hledger-web/Hledger/Web/App.hs | 18 ++++++++++++------ 3 files changed, 15 insertions(+), 7 deletions(-) rename hledger-web/.hledger/{web => unused}/addform.hamlet (92%) rename hledger-web/.hledger/{web => unused}/addformpostingfields.hamlet (100%) diff --git a/hledger-web/.hledger/web/addform.hamlet b/hledger-web/.hledger/unused/addform.hamlet similarity index 92% rename from hledger-web/.hledger/web/addform.hamlet rename to hledger-web/.hledger/unused/addform.hamlet index bfeba5fb0..89c9478a1 100644 --- a/hledger-web/.hledger/web/addform.hamlet +++ b/hledger-web/.hledger/unused/addform.hamlet @@ -1,7 +1,7 @@ %script!type=text/javascript $$(document).ready(function() { /* dhtmlxcombo setup */ - window.dhx_globalImgPath="../static/images/"; + window.dhx_globalImgPath="../static/"; var desccombo = new dhtmlXCombo("description"); var acct1combo = new dhtmlXCombo("account1"); var acct2combo = new dhtmlXCombo("account2"); @@ -43,3 +43,5 @@ %td!colspan=4 %input!type=hidden!name=action!value=add %input!type=submit!name=submit!value="add transaction" + $if manyfiles + \ to: ^journalselect.files^ diff --git a/hledger-web/.hledger/web/addformpostingfields.hamlet b/hledger-web/.hledger/unused/addformpostingfields.hamlet similarity index 100% rename from hledger-web/.hledger/web/addformpostingfields.hamlet rename to hledger-web/.hledger/unused/addformpostingfields.hamlet diff --git a/hledger-web/Hledger/Web/App.hs b/hledger-web/Hledger/Web/App.hs index ee250d47d..c662c2ae7 100644 --- a/hledger-web/Hledger/Web/App.hs +++ b/hledger-web/Hledger/Web/App.hs @@ -10,7 +10,7 @@ module Hledger.Web.App ) where import Control.Applicative ((<$>), (<*>)) -import Control.Failure +-- import Control.Failure -- import qualified Data.ByteString.Lazy as L import Data.Either -- import System.Directory @@ -24,8 +24,8 @@ import Yesod.Helpers.Static -- import Yesod.Helpers.Auth -- import Yesod.Mail -- import Yesod.WebRoutes -import Text.Hamlet (defaultHamletSettings) -import Text.Hamlet.RT +-- import Text.Hamlet (defaultHamletSettings) +-- import Text.Hamlet.RT import Hledger.Cli.Add (appendToJournalFile) import Hledger.Cli.Balance @@ -101,8 +101,8 @@ mkYesod "App" [$parseRoutes| /accounts AccountsOnlyR GET /journal JournalR GET POST /register RegisterR GET POST -/addformrt AddformRTR GET |] +-- /addformrt AddformRTR GET type Handler = GHandler App App @@ -429,6 +429,8 @@ helplink :: String -> String -> Hamlet AppRoute helplink topic label = [$hamlet|%a!href=$u$!target=hledgerhelp $label$|] where u = manualurl ++ if null topic then "" else '#':topic +{- + -- | Render a runtime template with the provided runtime data as html. renderHamletFileRT :: FilePath -> HamletMap AppRoute -> Handler Html renderHamletFileRT hfile hmap = do @@ -472,6 +474,8 @@ hdstringlist ss = HDList [ [([], hdstring s)] | s <- ss ] -- hamletToHamletRT :: Failure HamletException m => Hamlet AppRoute -> m HamletRT -- hamletToHamletRT h = stringToHamletRT $ show $ unsafeByteString $ renderHamlet show h +-} + ---------------------------------------------------------------------- -- handlers/views ---------------------------------------------------------------------- @@ -1029,7 +1033,7 @@ mixedAmountAsHtml b = preEscapedString $ addclass $ intercalate "
" $ lines $ -- hamletToRepHtml $ pageLayout td $ editform td s ---------------------------------------------------------------------- - +{- -- | An add form with template files reloaded at runtime. getAddformRTR :: Handler RepHtml getAddformRTR = do @@ -1076,6 +1080,8 @@ getAddformRTR = do ,(["deschelp"], hdstring "eg: supermarket (optional)") ,(["postingfields1"], HDHtml pfields1) ,(["postingfields2"], HDHtml pfields2) + ,(["manyfiles"], HDBool $ (length $ files $ j) > 1) +-- ,(["files"], ... $ files $ j) ] :: HamletMap AppRoute) hamletToRepHtml $ pageLayout td $ htmlAsHamlet addform - +-} \ No newline at end of file