From 8dd52decb2d412e1b06cb7a7614121a697303e02 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Tue, 16 Nov 2010 17:13:32 +0000
Subject: [PATCH] web: simplify support files layout, look for them in
 ./.hledger/web/

---
 .../{data/templates => .hledger/web}/.version    |   0
 .../templates => .hledger/web}/addform.hamlet    |   0
 .../web}/addformpostingfields.hamlet             |   0
 .../static => .hledger/web}/combo_select.gif     | Bin
 .../{data/static => .hledger/web}/dhtmlxcombo.js |   0
 .../static => .hledger/web}/dhtmlxcommon.js      |   0
 hledger-web/.hledger/web/favicon.ico             | Bin 0 -> 1150 bytes
 .../{data/static => .hledger/web}/hledger.js     |   0
 .../{data/static => .hledger/web}/jquery.js      |   0
 .../{data/static => .hledger/web}/jquery.url.js  |   0
 .../{data/static => .hledger/web}/style.css      |   0
 hledger-web/Hledger/Web/Settings.hs              |   6 +++---
 hledger-web/hledger-web.cabal                    |   2 +-
 13 files changed, 4 insertions(+), 4 deletions(-)
 rename hledger-web/{data/templates => .hledger/web}/.version (100%)
 rename hledger-web/{data/templates => .hledger/web}/addform.hamlet (100%)
 rename hledger-web/{data/templates => .hledger/web}/addformpostingfields.hamlet (100%)
 rename hledger-web/{data/static => .hledger/web}/combo_select.gif (100%)
 rename hledger-web/{data/static => .hledger/web}/dhtmlxcombo.js (100%)
 rename hledger-web/{data/static => .hledger/web}/dhtmlxcommon.js (100%)
 create mode 100644 hledger-web/.hledger/web/favicon.ico
 rename hledger-web/{data/static => .hledger/web}/hledger.js (100%)
 rename hledger-web/{data/static => .hledger/web}/jquery.js (100%)
 rename hledger-web/{data/static => .hledger/web}/jquery.url.js (100%)
 rename hledger-web/{data/static => .hledger/web}/style.css (100%)

diff --git a/hledger-web/data/templates/.version b/hledger-web/.hledger/web/.version
similarity index 100%
rename from hledger-web/data/templates/.version
rename to hledger-web/.hledger/web/.version
diff --git a/hledger-web/data/templates/addform.hamlet b/hledger-web/.hledger/web/addform.hamlet
similarity index 100%
rename from hledger-web/data/templates/addform.hamlet
rename to hledger-web/.hledger/web/addform.hamlet
diff --git a/hledger-web/data/templates/addformpostingfields.hamlet b/hledger-web/.hledger/web/addformpostingfields.hamlet
similarity index 100%
rename from hledger-web/data/templates/addformpostingfields.hamlet
rename to hledger-web/.hledger/web/addformpostingfields.hamlet
diff --git a/hledger-web/data/static/combo_select.gif b/hledger-web/.hledger/web/combo_select.gif
similarity index 100%
rename from hledger-web/data/static/combo_select.gif
rename to hledger-web/.hledger/web/combo_select.gif
diff --git a/hledger-web/data/static/dhtmlxcombo.js b/hledger-web/.hledger/web/dhtmlxcombo.js
similarity index 100%
rename from hledger-web/data/static/dhtmlxcombo.js
rename to hledger-web/.hledger/web/dhtmlxcombo.js
diff --git a/hledger-web/data/static/dhtmlxcommon.js b/hledger-web/.hledger/web/dhtmlxcommon.js
similarity index 100%
rename from hledger-web/data/static/dhtmlxcommon.js
rename to hledger-web/.hledger/web/dhtmlxcommon.js
diff --git a/hledger-web/.hledger/web/favicon.ico b/hledger-web/.hledger/web/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..4613ed03a65f518e28cd421beb06f346bedf0e1e
GIT binary patch
literal 1150
zcmai!--{Aa6vuBE1--NoL@%*DMlV4SK@YvvbI>1A&%MMFkx;b$VAM=knRM14tGhdn
zKgLy=5mzPMY}H+Vu&V{pO1TjD=7Wf6r+Z!QAk#oIeCOPI=6udMocV#!IeacHA$+}o
zo}EYNDnjTc7ItCJnI9X3@ICbb07$KV|JU`z1{-_7V*QpAa;xoT`|fl){U=V%jmKkM
zUP?ZfL-t`y4ghcTK{L>TeNS~3Wum?8R@Qb<J$NvgOmu4YsNJ}q@Yx$p$q$5`^A^{f
zCpoBUTpf5*<o9X+^cu-A7!0nYBLTJ~xMq~2mbWtsM|o=Nd-cbJ4>{lUXuR5r9uw(Z
zGsh>fWFUNI)74OObbpxffv_6U<R!0MApEWv4%2uo%bU(-Nc*NX$?Octyvw`kS6UqP
z@s>5s`ecrsqt5O6m+})Dt7SRk8z{T?G;>sPm8acq=T<GnDbI}NsHMEHW;1~;m<E$q
z1dBNY+}kjGW-Cgr{C1ujjYbzzK4wfgVtLjK2FE)1<t7BOEk$H+WaD7PxqLWR#3CG%
z8KyRz9l{lOCs?dDaK}mtv&b*5-Ldk_z~Ca7m!p2+qumG$7ymCudawtR->db;L;6h=
z3dKjxV7&NYJ3n2lp<X*8#mQDeG7pEtOQfz^KTb}TMXB)8wjS$xcJ^nKpVtf|4v#xu
z@2DBAJ?X2_YTw%wvktRI_?gJ$UXXW1Gxjw?<I4#3bO`CO@J~dM9<S%ZE<F{FDPF|P
JGD3ea`xmCx5C#AM

literal 0
HcmV?d00001

diff --git a/hledger-web/data/static/hledger.js b/hledger-web/.hledger/web/hledger.js
similarity index 100%
rename from hledger-web/data/static/hledger.js
rename to hledger-web/.hledger/web/hledger.js
diff --git a/hledger-web/data/static/jquery.js b/hledger-web/.hledger/web/jquery.js
similarity index 100%
rename from hledger-web/data/static/jquery.js
rename to hledger-web/.hledger/web/jquery.js
diff --git a/hledger-web/data/static/jquery.url.js b/hledger-web/.hledger/web/jquery.url.js
similarity index 100%
rename from hledger-web/data/static/jquery.url.js
rename to hledger-web/.hledger/web/jquery.url.js
diff --git a/hledger-web/data/static/style.css b/hledger-web/.hledger/web/style.css
similarity index 100%
rename from hledger-web/data/static/style.css
rename to hledger-web/.hledger/web/style.css
diff --git a/hledger-web/Hledger/Web/Settings.hs b/hledger-web/Hledger/Web/Settings.hs
index f71b9c2d0..564bed1c9 100644
--- a/hledger-web/Hledger/Web/Settings.hs
+++ b/hledger-web/Hledger/Web/Settings.hs
@@ -79,13 +79,13 @@ robots_txt = "User-agent: *"
 -- XXX hard-coded data directory path. This must be in your current dir
 -- when you run or compile hledger-web.
 datadir :: FilePath
-datadir = "data"
+datadir = ".hledger"
 
 staticdir :: FilePath
-staticdir = datadir ++ "/static"
+staticdir = datadir ++ "/web"
 
 templatesdir :: FilePath
-templatesdir = datadir ++ "/templates"
+templatesdir = datadir ++ "/web"
 
 -- The following are compile-time macros. If the file paths they point to
 -- don't exist, they will give an error (at compile time). In production
diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal
index f9d439b1d..5c314ac5e 100644
--- a/hledger-web/hledger-web.cabal
+++ b/hledger-web/hledger-web.cabal
@@ -14,7 +14,7 @@ stability:      alpha
 tested-with:    GHC==6.12
 cabal-version:  >= 1.6
 build-type:     Simple
-data-dir:       data
+data-dir:       .hledger
 data-files:
                 static/style.css
                 static/hledger.js