Move themes from client/assets/src/themes to client/assets/themes

diff --git a/client/assets/src/app.js b/client/assets/src/app.js
index 15abc2d4714ed0ea22e59a09ff8faac8e3688741..6320c5f364c61f4799efa4eed9d1eb6ea85b42a3 100644 (file)
--- a/client/assets/src/app.js
+++ b/client/assets/src/app.js
@@ -116,7 +116,7 @@ _kiwi.global = {
 \r
         if (opts.server_settings.client.themes) {\r
             _.each(opts.server_settings.client.themes, function (theme) {\r
-                var link = $.parseHTML('<link rel="alternate stylesheet" type="text/css" data-theme href="'+ opts.base_path + '/assets/src/themes/' + theme.name.toLowerCase() + '/style.css" title="' + theme.name.toLowerCase() + '" disabled/>');\r
+                var link = $.parseHTML('<link rel="alternate stylesheet" type="text/css" data-theme href="'+ opts.base_path + '/assets/themes/' + theme.name.toLowerCase() + '/style.css" title="' + theme.name.toLowerCase() + '" disabled/>');\r
                 link.disabled = true;\r
                 $(link).appendTo($('head'));\r
             });\r

diff --git a/client/assets/src/themes/basic/style.css b/client/assets/themes/basic/style.css
similarity index 99%
rename from client/assets/src/themes/basic/style.css
rename to client/assets/themes/basic/style.css
index 0a38341da2aa3a76496ab0cb8dc218605fa1a691..9eed0f458e99c413479b01c073bb022b4063c017 100644 (file)
--- a/client/assets/src/themes/basic/style.css
+++ b/client/assets/themes/basic/style.css
@@ -1,5 +1,5 @@
 #kiwi {
-    background: url(../../../img/background-light.png) left top repeat-x #E3E3E3;
+    background: url(../../img/background-light.png) left top repeat-x #E3E3E3;
     color: #555555;
 }
 #kiwi,

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

diff --git a/client/assets/src/themes/cli/style.css b/client/assets/themes/cli/style.css
similarity index 100%
rename from client/assets/src/themes/cli/style.css
rename to client/assets/themes/cli/style.css

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

diff --git a/client/assets/src/themes/mini/style.css b/client/assets/themes/mini/style.css
similarity index 100%
rename from client/assets/src/themes/mini/style.css
rename to client/assets/themes/mini/style.css

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

diff --git a/client/assets/src/themes/relaxed/style.css b/client/assets/themes/relaxed/style.css
similarity index 99%
rename from client/assets/src/themes/relaxed/style.css
rename to client/assets/themes/relaxed/style.css
index 6413dd1884ac381314421abb6173722949be3953..4b5aa7ef1a80587444681da97eb5f0a5f0632de0 100644 (file)
--- a/client/assets/src/themes/relaxed/style.css
+++ b/client/assets/themes/relaxed/style.css
@@ -1,5 +1,5 @@
 #kiwi {
-    background: url('../../../img/background-light.png') left top repeat-x #E3E3E3;
+    background: url('../../img/background-light.png') left top repeat-x #E3E3E3;
     color: #555555;
 }
 #kiwi,

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

diff --git a/server/httphandler.js b/server/httphandler.js
index 80bec4c3c525376af6f467dad90b379f1b4adf78..22c27de5f64f76f3c9a01a37d5ab236702a8343d 100644 (file)
--- a/server/httphandler.js
+++ b/server/httphandler.js
@@ -355,7 +355,7 @@ function readThemeInfo(themes, prev, callback) {
         prev = [];
     }
 
-    fs.readFile(__dirname + '/../client/assets/src/themes/' + theme.toLowerCase() + '/theme.json', function (err, theme_json) {
+    fs.readFile(__dirname + '/../client/assets/themes/' + theme.toLowerCase() + '/theme.json', function (err, theme_json) {
         if (err) {
             return callback(err);
         }