Move src files out of assets dir

* client/assets/src moved to client/src
* build.js moved to client/build.js
* Auto-generated index.html now written to assets/index.html
* Fixed bug where conf.public_http was set in config file ut conf.public_html was being read in httphandler.js

diff --git a/.gitignore b/.gitignore
index 16f2aeeec4bdf199a1a5801b3a5497adf6d7c5ff..0ca71dd7a81cfce29a12f42c946ef707695affb1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@ client/assets/libs/engine.io.bundle.*
 client/assets/kiwi.js
 client/assets/kiwi.min.js
 client/assets/locales/*.json
-client/index.html
+client/assets/index.html
 kiwi.log
 kiwiirc.pid
 config.js
\ No newline at end of file

diff --git a/client/assets/src/build.js b/client/build.js
similarity index 58%
rename from client/assets/src/build.js
rename to client/build.js
index 0fb8b8c81722bc389869408d4b9b6a31f98df1d7..f80d0a4b15838fe7b734004625a233475b1e214c 100644 (file)
--- a/client/assets/src/build.js
+++ b/client/build.js
@@ -2,7 +2,7 @@ var fs        = require('fs'),
     uglifyJS  = require('uglify-js'),\r
     _         = require('lodash'),\r
     po2json   = require('po2json'),\r
-    config    = require('./../../../server/configuration.js');\r
+    config    = require('../server/configuration.js');\r
 \r
 var FILE_ENCODING = 'utf-8',\r
     EOL = '\n';\r
@@ -39,48 +39,48 @@ config.loadConfig();
 \r
 \r
 var source_files = [\r
-    __dirname + '/app.js',\r
-    __dirname + '/models/application.js',\r
-    __dirname + '/models/gateway.js',\r
-    __dirname + '/models/network.js',\r
-    __dirname + '/models/member.js',\r
-    __dirname + '/models/memberlist.js',\r
-    __dirname + '/models/newconnection.js',\r
-    __dirname + '/models/panel.js',\r
-    __dirname + '/models/panellist.js',\r
-    __dirname + '/models/networkpanellist.js',\r
-    __dirname + '/models/channel.js',\r
-    __dirname + '/models/query.js',\r
-    __dirname + '/models/server.js',\r
-    __dirname + '/models/applet.js',\r
-    __dirname + '/models/pluginmanager.js',\r
-    __dirname + '/models/datastore.js',\r
-\r
-    __dirname + '/applets/settings.js',\r
-    __dirname + '/applets/chanlist.js',\r
-    __dirname + '/applets/scripteditor.js',\r
-\r
-    __dirname + '/helpers/utils.js',\r
-\r
-    __dirname + '/views/panel.js',\r
-    __dirname + '/views/channel.js',\r
-    __dirname + '/views/applet.js',\r
-    __dirname + '/views/application.js',\r
-    __dirname + '/views/apptoolbar.js',\r
-    __dirname + '/views/controlbox.js',\r
-    __dirname + '/views/favicon.js',\r
-    __dirname + '/views/mediamessage.js',\r
-    __dirname + '/views/member.js',\r
-    __dirname + '/views/memberlist.js',\r
-    __dirname + '/views/menubox.js',\r
-    __dirname + '/views/networktabs.js',\r
-    __dirname + '/views/nickchangebox.js',\r
-    __dirname + '/views/resizehandler.js',\r
-    __dirname + '/views/serverselect.js',\r
-    __dirname + '/views/statusmessage.js',\r
-    __dirname + '/views/tabs.js',\r
-    __dirname + '/views/topicbar.js',\r
-    __dirname + '/views/userbox.js'\r
+    __dirname + '/src/app.js',\r
+    __dirname + '/src/models/application.js',\r
+    __dirname + '/src/models/gateway.js',\r
+    __dirname + '/src/models/network.js',\r
+    __dirname + '/src/models/member.js',\r
+    __dirname + '/src/models/memberlist.js',\r
+    __dirname + '/src/models/newconnection.js',\r
+    __dirname + '/src/models/panel.js',\r
+    __dirname + '/src/models/panellist.js',\r
+    __dirname + '/src/models/networkpanellist.js',\r
+    __dirname + '/src/models/channel.js',\r
+    __dirname + '/src/models/query.js',\r
+    __dirname + '/src/models/server.js',\r
+    __dirname + '/src/models/applet.js',\r
+    __dirname + '/src/models/pluginmanager.js',\r
+    __dirname + '/src/models/datastore.js',\r
+\r
+    __dirname + '/src/applets/settings.js',\r
+    __dirname + '/src/applets/chanlist.js',\r
+    __dirname + '/src/applets/scripteditor.js',\r
+\r
+    __dirname + '/src/helpers/utils.js',\r
+\r
+    __dirname + '/src/views/panel.js',\r
+    __dirname + '/src/views/channel.js',\r
+    __dirname + '/src/views/applet.js',\r
+    __dirname + '/src/views/application.js',\r
+    __dirname + '/src/views/apptoolbar.js',\r
+    __dirname + '/src/views/controlbox.js',\r
+    __dirname + '/src/views/favicon.js',\r
+    __dirname + '/src/views/mediamessage.js',\r
+    __dirname + '/src/views/member.js',\r
+    __dirname + '/src/views/memberlist.js',\r
+    __dirname + '/src/views/menubox.js',\r
+    __dirname + '/src/views/networktabs.js',\r
+    __dirname + '/src/views/nickchangebox.js',\r
+    __dirname + '/src/views/resizehandler.js',\r
+    __dirname + '/src/views/serverselect.js',\r
+    __dirname + '/src/views/statusmessage.js',\r
+    __dirname + '/src/views/tabs.js',\r
+    __dirname + '/src/views/topicbar.js',\r
+    __dirname + '/src/views/userbox.js'\r
 ];\r
 \r
 \r
@@ -91,7 +91,7 @@ concat(source_files, function (err, src) {
     if (!err) {\r
         src = '(function (global, undefined) {\n\n' + src + '\n\n})(window);';\r
 \r
-        fs.writeFile(__dirname + '/../kiwi.js', src, { encoding: FILE_ENCODING }, function (err) {\r
+        fs.writeFile(__dirname + '/assets/kiwi.js', src, { encoding: FILE_ENCODING }, function (err) {\r
             if (!err) {\r
                 console.log('Built kiwi.js');\r
             } else {\r
@@ -111,7 +111,7 @@ concat(source_files, function (err, src) {
         ast.mangle_names();\r
         src = ast.print_to_string();\r
 \r
-        fs.writeFile(__dirname + '/../kiwi.min.js', src, { encoding: FILE_ENCODING }, function (err) {\r
+        fs.writeFile(__dirname + '/assets/kiwi.min.js', src, { encoding: FILE_ENCODING }, function (err) {\r
             if (!err) {\r
                 console.log('Built kiwi.min.js');\r
             } else {\r
@@ -131,9 +131,9 @@ concat(source_files, function (err, src) {
 /**\r
  * Build the engineio client + tools libs\r
  */\r
-concat([__dirname + '/../libs/engine.io.js', __dirname + '/../libs/engine.io.tools.js'], function (err, src) {\r
+concat([__dirname + '/assets/libs/engine.io.js', __dirname + '/assets/libs/engine.io.tools.js'], function (err, src) {\r
     if (!err) {\r
-        fs.writeFile(__dirname + '/../libs/engine.io.bundle.js', src, { encoding: FILE_ENCODING }, function (err) {\r
+        fs.writeFile(__dirname + '/assets/libs/engine.io.bundle.js', src, { encoding: FILE_ENCODING }, function (err) {\r
             if (!err) {\r
                 console.log('Built engine.io.bundle.js');\r
             } else {\r
@@ -149,7 +149,7 @@ concat([__dirname + '/../libs/engine.io.js', __dirname + '/../libs/engine.io.too
         ast.mangle_names();\r
         src = ast.print_to_string();\r
 \r
-        fs.writeFile(__dirname + '/../libs/engine.io.bundle.min.js', src, { encoding: FILE_ENCODING }, function (err) {\r
+        fs.writeFile(__dirname + '/assets/libs/engine.io.bundle.min.js', src, { encoding: FILE_ENCODING }, function (err) {\r
             if (!err) {\r
                 console.log('Built engine.io.bundle.min.js');\r
             } else {\r
@@ -169,18 +169,18 @@ concat([__dirname + '/../libs/engine.io.js', __dirname + '/../libs/engine.io.too
 /**\r
 *   Convert translations from .po to .json\r
 */\r
-if (!fs.existsSync(__dirname + '/../locales')) {\r
-    fs.mkdirSync(__dirname + '/../locales');\r
+if (!fs.existsSync(__dirname + '/assets/locales')) {\r
+    fs.mkdirSync(__dirname + '/assets/locales');\r
 }\r
-fs.readdir(__dirname + '/translations', function (err, translation_files) {\r
+fs.readdir(__dirname + '/src/translations', function (err, translation_files) {\r
     if (!err) {\r
         translation_files.forEach(function (file) {\r
             var locale = file.slice(0, -3);\r
 \r
             if ((file.slice(-3) === '.po') && (locale !== 'template')) {\r
-                po2json.parse(__dirname + '/translations/' + file, function (err, json) {\r
+                po2json.parse(__dirname + '/src/translations/' + file, function (err, json) {\r
                     if (!err) {\r
-                        fs.writeFile(__dirname + '/../locales/' + locale + '.json', JSON.stringify(json), function (err) {\r
+                        fs.writeFile(__dirname + '/assets/locales/' + locale + '.json', JSON.stringify(json), function (err) {\r
                             if (!err) {\r
                                 console.log('Built translation file %s.json', locale);\r
                             } else {\r
@@ -207,10 +207,10 @@ fs.readdir(__dirname + '/translations', function (err, translation_files) {
  * Build the index.html file\r
  */\r
 \r
-var index_src = fs.readFileSync(__dirname + '/index.html.tmpl', FILE_ENCODING)\r
+var index_src = fs.readFileSync(__dirname + '/src/index.html.tmpl', FILE_ENCODING)\r
     .replace(new RegExp('<%base_path%>', 'g'), config.get().http_base_path || '/kiwi');\r
 \r
-fs.writeFile(__dirname + '/../../index.html', index_src, { encoding: FILE_ENCODING }, function (err) {\r
+fs.writeFile(__dirname + '/assets/index.html', index_src, { encoding: FILE_ENCODING }, function (err) {\r
     if (!err) {\r
         console.log('Built index.html');\r
     } else {\r

diff --git a/client/assets/src/app.js b/client/src/app.js
similarity index 100%
rename from client/assets/src/app.js
rename to client/src/app.js

diff --git a/client/assets/src/applets/chanlist.js b/client/src/applets/chanlist.js
similarity index 100%
rename from client/assets/src/applets/chanlist.js
rename to client/src/applets/chanlist.js

diff --git a/client/assets/src/applets/scripteditor.js b/client/src/applets/scripteditor.js
similarity index 100%
rename from client/assets/src/applets/scripteditor.js
rename to client/src/applets/scripteditor.js

diff --git a/client/assets/src/applets/settings.js b/client/src/applets/settings.js
similarity index 100%
rename from client/assets/src/applets/settings.js
rename to client/src/applets/settings.js

diff --git a/client/assets/src/helpers/utils.js b/client/src/helpers/utils.js
similarity index 100%
rename from client/assets/src/helpers/utils.js
rename to client/src/helpers/utils.js

diff --git a/client/assets/src/index.html.tmpl b/client/src/index.html.tmpl
similarity index 96%
rename from client/assets/src/index.html.tmpl
rename to client/src/index.html.tmpl
index 47ab89eb3722a36a8a1d10eda8db76207f652d47..d9e8fee3997f898196a6b83f50b339c6a0190b8a 100644 (file)
--- a/client/assets/src/index.html.tmpl
+++ b/client/src/index.html.tmpl
@@ -439,7 +439,7 @@
         var cur_script = 0;\r
         function loadNextScript () {\r
             var to_load,\r
-                base = base_path + '/assets/';\r
+                base = base_path + '/';\r
 \r
             // Start the kiwi app if all scripts have been loaded\r
             if (cur_script === scripts.length) {\r
@@ -463,14 +463,14 @@
 \r
         // If we're not interested in debug libs, start loading production files\r
         if (!getQueryVariable('debug')) {\r
-            scripts.push(['libs/lodash.min.js']);\r
+            scripts.push(['assets/libs/lodash.min.js']);\r
             scripts.push([\r
-                'libs/backbone.min.js',\r
-                'libs/jed.js'\r
+                'assets/libs/backbone.min.js',\r
+                'assets/libs/jed.js'\r
             ]);\r
             scripts.push([\r
-                'kiwi.min.js',\r
-                'libs/engine.io.bundle.min.js'\r
+                'assets/kiwi.min.js',\r
+                'assets/libs/engine.io.bundle.min.js'\r
             ]);\r
 \r
             loadNextScript();\r

diff --git a/client/assets/src/models/applet.js b/client/src/models/applet.js
similarity index 100%
rename from client/assets/src/models/applet.js
rename to client/src/models/applet.js

diff --git a/client/assets/src/models/application.js b/client/src/models/application.js
similarity index 100%
rename from client/assets/src/models/application.js
rename to client/src/models/application.js

diff --git a/client/assets/src/models/channel.js b/client/src/models/channel.js
similarity index 100%
rename from client/assets/src/models/channel.js
rename to client/src/models/channel.js

diff --git a/client/assets/src/models/datastore.js b/client/src/models/datastore.js
similarity index 100%
rename from client/assets/src/models/datastore.js
rename to client/src/models/datastore.js

diff --git a/client/assets/src/models/gateway.js b/client/src/models/gateway.js
similarity index 100%
rename from client/assets/src/models/gateway.js
rename to client/src/models/gateway.js

diff --git a/client/assets/src/models/member.js b/client/src/models/member.js
similarity index 100%
rename from client/assets/src/models/member.js
rename to client/src/models/member.js

diff --git a/client/assets/src/models/memberlist.js b/client/src/models/memberlist.js
similarity index 100%
rename from client/assets/src/models/memberlist.js
rename to client/src/models/memberlist.js

diff --git a/client/assets/src/models/network.js b/client/src/models/network.js
similarity index 100%
rename from client/assets/src/models/network.js
rename to client/src/models/network.js

diff --git a/client/assets/src/models/networkpanellist.js b/client/src/models/networkpanellist.js
similarity index 100%
rename from client/assets/src/models/networkpanellist.js
rename to client/src/models/networkpanellist.js

diff --git a/client/assets/src/models/newconnection.js b/client/src/models/newconnection.js
similarity index 100%
rename from client/assets/src/models/newconnection.js
rename to client/src/models/newconnection.js

diff --git a/client/assets/src/models/panel.js b/client/src/models/panel.js
similarity index 100%
rename from client/assets/src/models/panel.js
rename to client/src/models/panel.js

diff --git a/client/assets/src/models/panellist.js b/client/src/models/panellist.js
similarity index 100%
rename from client/assets/src/models/panellist.js
rename to client/src/models/panellist.js

diff --git a/client/assets/src/models/pluginmanager.js b/client/src/models/pluginmanager.js
similarity index 100%
rename from client/assets/src/models/pluginmanager.js
rename to client/src/models/pluginmanager.js

diff --git a/client/assets/src/models/query.js b/client/src/models/query.js
similarity index 100%
rename from client/assets/src/models/query.js
rename to client/src/models/query.js

diff --git a/client/assets/src/models/server.js b/client/src/models/server.js
similarity index 100%
rename from client/assets/src/models/server.js
rename to client/src/models/server.js

diff --git a/client/assets/src/translations/de-de.po b/client/src/translations/de-de.po
similarity index 100%
rename from client/assets/src/translations/de-de.po
rename to client/src/translations/de-de.po

diff --git a/client/assets/src/translations/en-gb.po b/client/src/translations/en-gb.po
similarity index 100%
rename from client/assets/src/translations/en-gb.po
rename to client/src/translations/en-gb.po

diff --git a/client/assets/src/translations/es-419.po b/client/src/translations/es-419.po
similarity index 100%
rename from client/assets/src/translations/es-419.po
rename to client/src/translations/es-419.po

diff --git a/client/assets/src/translations/fr.po b/client/src/translations/fr.po
similarity index 100%
rename from client/assets/src/translations/fr.po
rename to client/src/translations/fr.po

diff --git a/client/assets/src/translations/he.po b/client/src/translations/he.po
similarity index 100%
rename from client/assets/src/translations/he.po
rename to client/src/translations/he.po

diff --git a/client/assets/src/translations/it.po b/client/src/translations/it.po
similarity index 100%
rename from client/assets/src/translations/it.po
rename to client/src/translations/it.po

diff --git a/client/assets/src/translations/nl.po b/client/src/translations/nl.po
similarity index 100%
rename from client/assets/src/translations/nl.po
rename to client/src/translations/nl.po

diff --git a/client/assets/src/translations/no.po b/client/src/translations/no.po
similarity index 100%
rename from client/assets/src/translations/no.po
rename to client/src/translations/no.po

diff --git a/client/assets/src/translations/pt-br.po b/client/src/translations/pt-br.po
similarity index 100%
rename from client/assets/src/translations/pt-br.po
rename to client/src/translations/pt-br.po

diff --git a/client/assets/src/translations/ro.po b/client/src/translations/ro.po
similarity index 100%
rename from client/assets/src/translations/ro.po
rename to client/src/translations/ro.po

diff --git a/client/assets/src/translations/ru.po b/client/src/translations/ru.po
similarity index 100%
rename from client/assets/src/translations/ru.po
rename to client/src/translations/ru.po

diff --git a/client/assets/src/translations/template.po b/client/src/translations/template.po
similarity index 100%
rename from client/assets/src/translations/template.po
rename to client/src/translations/template.po

diff --git a/client/assets/src/translations/tr.po b/client/src/translations/tr.po
similarity index 100%
rename from client/assets/src/translations/tr.po
rename to client/src/translations/tr.po

diff --git a/client/assets/src/translations/translations.json b/client/src/translations/translations.json
similarity index 100%
rename from client/assets/src/translations/translations.json
rename to client/src/translations/translations.json

diff --git a/client/assets/src/translations/vi.po b/client/src/translations/vi.po
similarity index 100%
rename from client/assets/src/translations/vi.po
rename to client/src/translations/vi.po

diff --git a/client/assets/src/translations/zh-tw.po b/client/src/translations/zh-tw.po
similarity index 100%
rename from client/assets/src/translations/zh-tw.po
rename to client/src/translations/zh-tw.po

diff --git a/client/assets/src/views/applet.js b/client/src/views/applet.js
similarity index 100%
rename from client/assets/src/views/applet.js
rename to client/src/views/applet.js

diff --git a/client/assets/src/views/application.js b/client/src/views/application.js
similarity index 100%
rename from client/assets/src/views/application.js
rename to client/src/views/application.js

diff --git a/client/assets/src/views/apptoolbar.js b/client/src/views/apptoolbar.js
similarity index 100%
rename from client/assets/src/views/apptoolbar.js
rename to client/src/views/apptoolbar.js

diff --git a/client/assets/src/views/channel.js b/client/src/views/channel.js
similarity index 100%
rename from client/assets/src/views/channel.js
rename to client/src/views/channel.js

diff --git a/client/assets/src/views/controlbox.js b/client/src/views/controlbox.js
similarity index 100%
rename from client/assets/src/views/controlbox.js
rename to client/src/views/controlbox.js

diff --git a/client/assets/src/views/favicon.js b/client/src/views/favicon.js
similarity index 100%
rename from client/assets/src/views/favicon.js
rename to client/src/views/favicon.js

diff --git a/client/assets/src/views/mediamessage.js b/client/src/views/mediamessage.js
similarity index 100%
rename from client/assets/src/views/mediamessage.js
rename to client/src/views/mediamessage.js

diff --git a/client/assets/src/views/member.js b/client/src/views/member.js
similarity index 100%
rename from client/assets/src/views/member.js
rename to client/src/views/member.js

diff --git a/client/assets/src/views/memberlist.js b/client/src/views/memberlist.js
similarity index 100%
rename from client/assets/src/views/memberlist.js
rename to client/src/views/memberlist.js

diff --git a/client/assets/src/views/menubox.js b/client/src/views/menubox.js
similarity index 100%
rename from client/assets/src/views/menubox.js
rename to client/src/views/menubox.js

diff --git a/client/assets/src/views/networktabs.js b/client/src/views/networktabs.js
similarity index 100%
rename from client/assets/src/views/networktabs.js
rename to client/src/views/networktabs.js

diff --git a/client/assets/src/views/nickchangebox.js b/client/src/views/nickchangebox.js
similarity index 100%
rename from client/assets/src/views/nickchangebox.js
rename to client/src/views/nickchangebox.js

diff --git a/client/assets/src/views/panel.js b/client/src/views/panel.js
similarity index 100%
rename from client/assets/src/views/panel.js
rename to client/src/views/panel.js

diff --git a/client/assets/src/views/resizehandler.js b/client/src/views/resizehandler.js
similarity index 100%
rename from client/assets/src/views/resizehandler.js
rename to client/src/views/resizehandler.js

diff --git a/client/assets/src/views/serverselect.js b/client/src/views/serverselect.js
similarity index 100%
rename from client/assets/src/views/serverselect.js
rename to client/src/views/serverselect.js

diff --git a/client/assets/src/views/statusmessage.js b/client/src/views/statusmessage.js
similarity index 100%
rename from client/assets/src/views/statusmessage.js
rename to client/src/views/statusmessage.js

diff --git a/client/assets/src/views/tabs.js b/client/src/views/tabs.js
similarity index 100%
rename from client/assets/src/views/tabs.js
rename to client/src/views/tabs.js

diff --git a/client/assets/src/views/topicbar.js b/client/src/views/topicbar.js
similarity index 100%
rename from client/assets/src/views/topicbar.js
rename to client/src/views/topicbar.js

diff --git a/client/assets/src/views/userbox.js b/client/src/views/userbox.js
similarity index 100%
rename from client/assets/src/views/userbox.js
rename to client/src/views/userbox.js

diff --git a/config.example.js b/config.example.js
index a86fdb1047920990118bec1bd24dddcfe5597d85..2e7cc5fb20d95642d76dd857f901dd35ef709b73 100644 (file)
--- a/config.example.js
+++ b/config.example.js
@@ -53,7 +53,7 @@ conf.identd = {
 
 
 // Where the client files are
-conf.public_http = "client/";
+conf.public_html = "client/";
 
 // Max connections per connection. 0 to disable
 conf.max_client_conns = 5;

diff --git a/server/httphandler.js b/server/httphandler.js
index bed9b4926d01613d153f7951a1551f3942f52326..68c4fbccfeb0ac50ad38712cfa9102b0d31cd19d 100644 (file)
--- a/server/httphandler.js
+++ b/server/httphandler.js
@@ -52,9 +52,12 @@ HttpHandler.prototype.serve = function (request, response) {
     // Any asset request to head into the asset dir
     request.url = request.url.replace(base_path + '/assets/', '/assets/');
 
+    // Any src request to head into the src dir
+    request.url = request.url.replace(base_path + '/src/', '/src/');
+
     // Any requests for /client to load the index file
     if (request.url.match(new RegExp('^' + base_path_regex + '([/$]|$)', 'i'))) {
-        request.url = '/';
+        request.url = '/assets/index.html';
     }
 
     // If the 'magic' translation is requested, figure out the best language to use from
@@ -208,9 +211,9 @@ function generateSettings(request, debug, callback) {
             translations: [],
             scripts: [
                 [
-                    'libs/lodash.min.js'
+                    'assets/libs/lodash.min.js'
                 ],
-                ['libs/backbone.min.js', 'libs/jed.js']
+                ['assets/libs/backbone.min.js', 'assets/libs/jed.js']
             ]
         };
 
@@ -218,8 +221,8 @@ function generateSettings(request, debug, callback) {
         vars.scripts = vars.scripts.concat([
             [
                 'src/app.js',
-                'libs/engine.io.js',
-                'libs/engine.io.tools.js'
+                'assets/libs/engine.io.js',
+                'assets/libs/engine.io.tools.js'
             ],
             [
                 'src/models/application.js',
@@ -281,7 +284,7 @@ function generateSettings(request, debug, callback) {
             ]
         ]);
     } else {
-        vars.scripts.push(['kiwi.min.js', 'libs/engine.io.bundle.min.js']);
+        vars.scripts.push(['assets/kiwi.min.js', 'assets/libs/engine.io.bundle.min.js']);
     }
 
     // Any restricted server mode set?
@@ -309,14 +312,14 @@ function generateSettings(request, debug, callback) {
     }
 
     // Get a list of available translations
-    fs.readFile(__dirname + '/../client/assets/src/translations/translations.json', function (err, translations) {
+    fs.readFile(__dirname + '/../client/src/translations/translations.json', function (err, translations) {
         if (err) {
             return callback(err);
         }
 
         var translation_files;
         translations = JSON.parse(translations);
-        fs.readdir(__dirname + '/../client/assets/src/translations/', function (err, pofiles) {
+        fs.readdir(__dirname + '/../client/src/translations/', function (err, pofiles) {
             var hash, settings;
             if (err) {
                 return callback(err);

diff --git a/server/server.js b/server/server.js
index c7e39e54202e060e8438816aac41b16622a9ee25..a139f60ce78d168c81d1d6a3471f7049656e98df 100644 (file)
--- a/server/server.js
+++ b/server/server.js
@@ -45,7 +45,7 @@ switch (process.argv[2]) {
         break;\r
 \r
     case 'build':\r
-        require('../client/assets/src/build.js');\r
+        require('../client/build.js');\r
         break;\r
         \r
     default:\r