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 000000000..4613ed03a Binary files /dev/null and b/hledger-web/.hledger/web/favicon.ico differ 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