summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFreeyorp <TheFreeYorp@NOSPAM.G.m.a.i.l.replace>2013-05-13 00:35:11 +1200
committerFreeyorp <TheFreeYorp@NOSPAM.G.m.a.i.l.replace>2013-05-13 00:41:08 +1200
commit5e332bfac3dfe2075dde30568498bc6c42ca27ce (patch)
treecaaa5d48e3f448527e3e62359a6b4453bdf3655f
parent2b3bf882d6b53f09e0dddf3f8d4f159832471fb3 (diff)
downloadmanavis-5e332bfac3dfe2075dde30568498bc6c42ca27ce.tar.gz
manavis-5e332bfac3dfe2075dde30568498bc6c42ca27ce.tar.bz2
manavis-5e332bfac3dfe2075dde30568498bc6c42ca27ce.tar.xz
manavis-5e332bfac3dfe2075dde30568498bc6c42ca27ce.zip
Move served files to a public/ directory
-rw-r--r--.gitmodules6
-rw-r--r--index.js7
-rw-r--r--public/css/style.css (renamed from css/style.css)0
-rw-r--r--public/index.html (renamed from index.html)0
-rw-r--r--public/js/comp/item.js (renamed from js/comp/item.js)0
-rwxr-xr-xpublic/js/comp/makeitem.sed (renamed from js/comp/makeitem.sed)0
-rwxr-xr-xpublic/js/comp/makemap.sed (renamed from js/comp/makemap.sed)0
-rwxr-xr-xpublic/js/comp/makemob.sed (renamed from js/comp/makemob.sed)0
-rw-r--r--public/js/comp/map.js (renamed from js/comp/map.js)0
-rw-r--r--public/js/comp/mob.js (renamed from js/comp/mob.js)0
-rw-r--r--public/js/comp/stat.js (renamed from js/comp/stat.js)0
m---------public/js/crossfilter (renamed from js/crossfilter)0
m---------public/js/d3 (renamed from js/d3)0
m---------public/js/dc (renamed from js/dc)0
-rw-r--r--public/js/mv/chart.js (renamed from js/mv/chart.js)0
-rw-r--r--public/js/mv/connect.js (renamed from js/mv/connect.js)0
-rw-r--r--public/js/mv/heap.js (renamed from js/mv/heap.js)0
-rw-r--r--public/js/mv/load.js (renamed from js/mv/load.js)0
-rw-r--r--public/js/mv/main.js (renamed from js/mv/main.js)0
-rw-r--r--public/js/mv/parse.js (renamed from js/mv/parse.js)0
-rw-r--r--public/js/util/memoize.js (renamed from js/util/memoize.js)0
-rw-r--r--public/js/util/progress.js (renamed from js/util/progress.js)0
-rw-r--r--public/js/util/trellis-chart.js (renamed from js/util/trellis-chart.js)0
23 files changed, 5 insertions, 8 deletions
diff --git a/.gitmodules b/.gitmodules
index 4f540a0..d719d48 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
[submodule "js/crossfilter"]
- path = js/crossfilter
+ path = public/js/crossfilter
url = git://github.com/square/crossfilter.git
[submodule "js/d3"]
- path = js/d3
+ path = public/js/d3
url = git://github.com/mbostock/d3.git
[submodule "js/dc"]
- path = js/dc
+ path = public/js/dc
url = git://github.com/Freeyorp/dc.js.git
diff --git a/index.js b/index.js
index 2c3e894..5b6c74f 100644
--- a/index.js
+++ b/index.js
@@ -15,7 +15,7 @@ app.configure(function () {
app.use(cookieParser);
app.use(express.session({ store: sessionStore }));
app.use(app.router);
- app.use(express.static(__dirname));
+ app.use(express.static(__dirname + "/public"));
});
var server = http.createServer(app)
@@ -88,10 +88,7 @@ sessionSockets.on('connection', function (err, socket, session) {
});
});
function logAction(action, content) {
- logger.info(session.nid
- , action
- , content
- );
+ logger.info(session.nid, action, content);
}
});
diff --git a/css/style.css b/public/css/style.css
index 2690b1f..2690b1f 100644
--- a/css/style.css
+++ b/public/css/style.css
diff --git a/index.html b/public/index.html
index baebbb2..baebbb2 100644
--- a/index.html
+++ b/public/index.html
diff --git a/js/comp/item.js b/public/js/comp/item.js
index 65596be..65596be 100644
--- a/js/comp/item.js
+++ b/public/js/comp/item.js
diff --git a/js/comp/makeitem.sed b/public/js/comp/makeitem.sed
index 45e5a91..45e5a91 100755
--- a/js/comp/makeitem.sed
+++ b/public/js/comp/makeitem.sed
diff --git a/js/comp/makemap.sed b/public/js/comp/makemap.sed
index 561530b..561530b 100755
--- a/js/comp/makemap.sed
+++ b/public/js/comp/makemap.sed
diff --git a/js/comp/makemob.sed b/public/js/comp/makemob.sed
index c934a4e..c934a4e 100755
--- a/js/comp/makemob.sed
+++ b/public/js/comp/makemob.sed
diff --git a/js/comp/map.js b/public/js/comp/map.js
index d845031..d845031 100644
--- a/js/comp/map.js
+++ b/public/js/comp/map.js
diff --git a/js/comp/mob.js b/public/js/comp/mob.js
index 022494e..022494e 100644
--- a/js/comp/mob.js
+++ b/public/js/comp/mob.js
diff --git a/js/comp/stat.js b/public/js/comp/stat.js
index cd75646..cd75646 100644
--- a/js/comp/stat.js
+++ b/public/js/comp/stat.js
diff --git a/js/crossfilter b/public/js/crossfilter
-Subproject ae994e8f8014ad4304e0575973bb23c1fb1ac0b
+Subproject ae994e8f8014ad4304e0575973bb23c1fb1ac0b
diff --git a/js/d3 b/public/js/d3
-Subproject 91d35b4205d4ef150c61c415b7379404bced726
+Subproject 91d35b4205d4ef150c61c415b7379404bced726
diff --git a/js/dc b/public/js/dc
-Subproject 649860c7f007ae41a89e1d6236748ba36292288
+Subproject 649860c7f007ae41a89e1d6236748ba36292288
diff --git a/js/mv/chart.js b/public/js/mv/chart.js
index d06d40e..d06d40e 100644
--- a/js/mv/chart.js
+++ b/public/js/mv/chart.js
diff --git a/js/mv/connect.js b/public/js/mv/connect.js
index aba4c33..aba4c33 100644
--- a/js/mv/connect.js
+++ b/public/js/mv/connect.js
diff --git a/js/mv/heap.js b/public/js/mv/heap.js
index 03f3c00..03f3c00 100644
--- a/js/mv/heap.js
+++ b/public/js/mv/heap.js
diff --git a/js/mv/load.js b/public/js/mv/load.js
index 39dd391..39dd391 100644
--- a/js/mv/load.js
+++ b/public/js/mv/load.js
diff --git a/js/mv/main.js b/public/js/mv/main.js
index b7fcb1e..b7fcb1e 100644
--- a/js/mv/main.js
+++ b/public/js/mv/main.js
diff --git a/js/mv/parse.js b/public/js/mv/parse.js
index 8094bc5..8094bc5 100644
--- a/js/mv/parse.js
+++ b/public/js/mv/parse.js
diff --git a/js/util/memoize.js b/public/js/util/memoize.js
index 796c060..796c060 100644
--- a/js/util/memoize.js
+++ b/public/js/util/memoize.js
diff --git a/js/util/progress.js b/public/js/util/progress.js
index 060e6dc..060e6dc 100644
--- a/js/util/progress.js
+++ b/public/js/util/progress.js
diff --git a/js/util/trellis-chart.js b/public/js/util/trellis-chart.js
index 65e07a2..65e07a2 100644
--- a/js/util/trellis-chart.js
+++ b/public/js/util/trellis-chart.js