diff --git a/app.js b/app.js
index d74b7cf513..96ea6fee76 100644
--- a/app.js
+++ b/app.js
@@ -2,6 +2,7 @@
var fs = require('fs'),
path = require('path'),
utils = require('./public/src/utils.js'),
+ url = require('url'),
args = {};
// Runtime environment
@@ -21,6 +22,8 @@ fs.readFile(path.join(__dirname, 'config.json'), function(err, data) {
global.config = JSON.parse(data);
global.config.url = global.config.base_url + (global.config.use_port ? ':' + global.config.port : '') + '/';
global.config.upload_url = global.config.url + 'uploads/';
+
+
console.log('Info: Base Configuration OK.');
var meta = require('./src/meta.js');
@@ -71,11 +74,13 @@ fs.readFile(path.join(__dirname, 'config.json'), function(err, data) {
default_categories = JSON.parse(default_categories);
for (var category in default_categories) {
+ console.log(category);
admin.categories.create(default_categories[category]);
}
});
- // Hardcoding uid 1 as an admin
+
+ console.log('Info: Hardcoding uid 1 as an admin');
var user = require('./src/user.js');
user.makeAdministrator(1);
} else {
@@ -123,11 +128,17 @@ fs.readFile(path.join(__dirname, 'config.json'), function(err, data) {
if (!secret) secret = utils.generateUUID();
if (!bcrypt_rounds) bcrypt_rounds = 10;
+ var urlObject = url.parse(base_url);
+ var relative_path = urlObject.pathname;
+ var host = urlObject.host;
+ var protocol = urlObject.protocol;
+
var fs = require('fs'),
path = require('path'),
config = {
secret: secret,
base_url: base_url,
+ relative_path: relative_path,
port: port,
use_port: use_port,
upload_path: '/public/uploads/',
@@ -162,10 +173,11 @@ fs.readFile(path.join(__dirname, 'config.json'), function(err, data) {
// Client-side config
fs.writeFile(path.join(__dirname, 'public', 'config.json'), JSON.stringify({
socket: {
- address: base_url,
+ address: protocol + '//' + host,
port: port
},
- api_url: base_url + (use_port ? ':' + port : '') + '/api/'
+ api_url: protocol + '//' + host + (use_port ? ':' + port : '') + relative_path + '/api/',
+ relative_path: relative_path
}, null, 4));
});
});
diff --git a/package.json b/package.json
index 6ec3aa08cb..3ea57dc4a3 100644
--- a/package.json
+++ b/package.json
@@ -36,6 +36,7 @@
"socket.io": "0.9.14",
"redis": "0.8.3",
"express": "3.2.0",
+ "express-namespace": "0.1.1",
"connect": "2.7.6",
"emailjs": "0.3.4",
"cookie": "0.0.6",
diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js
index 060373230f..d86225070e 100644
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@@ -38,12 +38,12 @@ var ajaxify = {};
} else if (templates[url]) {
tpl_url = url;
}
-
+
if (templates.is_available(tpl_url) && !templates.force_refresh(tpl_url)) {
if (quiet !== true) {
window.history.pushState({
"url": url
- }, url, "/" + url);
+ }, url, RELATIVE_PATH + '/' + url);
}
jQuery('#footer, #content').fadeOut(100);
diff --git a/public/src/app.js b/public/src/app.js
index d032a303b4..7007784a12 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -1,15 +1,17 @@
var socket,
config,
app = {},
- API_URL = null;
+ API_URL = null,
+ RELATIVE_PATH = null;
// todo: cleanup,etc
(function() {
$.ajax({
- url: '/config.json?v=' + new Date().getTime(),
+ url: '/forum/config.json?v=' + new Date().getTime(),
success: function(data) {
API_URL = data.api_url;
+ RELATIVE_PATH = data.relative_path;
config = data;
socket = io.connect(config.socket.address + (config.socket.port ? ':' + config.socket.port : ''));
@@ -244,6 +246,7 @@ var socket,
}
}, false);
+ $.getScript(RELATIVE_PATH + '/src/forum/footer.js');
addTouchEvents();
});
diff --git a/public/src/templates.js b/public/src/templates.js
index 871ce28242..07080492a6 100644
--- a/public/src/templates.js
+++ b/public/src/templates.js
@@ -86,9 +86,12 @@
}
function loadClient() {
- jQuery.when(jQuery.getJSON('/templates/config.json'), jQuery.getJSON('/api/get_templates_listing')).done(function(config_data, templates_data) {
+ jQuery.when(jQuery.getJSON(RELATIVE_PATH + '/templates/config.json'), jQuery.getJSON(RELATIVE_PATH + '/api/get_templates_listing')).done(function(config_data, templates_data) {
config = config_data[0];
available_templates = templates_data[0];
+
+
+
templates.ready();
});
}
@@ -131,7 +134,7 @@
var timestamp = new Date().getTime(); //debug
if (!templates[tpl_url]) {
- jQuery.get('/templates/' + tpl_url + '.tpl?v=' + timestamp, function(html) {
+ jQuery.get(RELATIVE_PATH + '/templates/' + tpl_url + '.tpl?v=' + timestamp, function(html) {
var template = function() {
this.toString = function() {
return this.html;
@@ -153,7 +156,10 @@
}());
(function() {
+ console.log(API_URL,api_url);
jQuery.get(API_URL + api_url, function(data) {
+
+
if(!data) {
ajaxify.go('404');
return;
@@ -170,6 +176,7 @@
function parse_template() {
if (!templates[tpl_url] || !template_data) return;
+ template_data['relative_path'] = RELATIVE_PATH || global.config.relative_path;
document.getElementById('content').innerHTML = templates[tpl_url].parse(template_data);
diff --git a/public/templates/account.tpl b/public/templates/account.tpl
index cc4e04a9bc..da49e47d71 100644
--- a/public/templates/account.tpl
+++ b/public/templates/account.tpl
@@ -101,4 +101,4 @@
-
+
-
+
diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index 667597b747..6cc5d0a350 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -9,27 +9,27 @@