From 148a0cd5ce757e155ae63b52d89ad6430895d810 Mon Sep 17 00:00:00 2001
From: Jack Allnutt <jack@allnutt.eu>
Date: Fri, 25 Oct 2013 22:46:00 +0100
Subject: [PATCH] Move themes from client/assets/src/themes to
 client/assets/themes

---
 client/assets/src/app.js                          | 2 +-
 client/assets/{src => }/themes/basic/style.css    | 2 +-
 client/assets/{src => }/themes/basic/theme.json   | 0
 client/assets/{src => }/themes/cli/style.css      | 0
 client/assets/{src => }/themes/cli/theme.json     | 0
 client/assets/{src => }/themes/mini/style.css     | 0
 client/assets/{src => }/themes/mini/theme.json    | 0
 client/assets/{src => }/themes/relaxed/style.css  | 2 +-
 client/assets/{src => }/themes/relaxed/theme.json | 0
 server/httphandler.js                             | 2 +-
 10 files changed, 4 insertions(+), 4 deletions(-)
 rename client/assets/{src => }/themes/basic/style.css (99%)
 rename client/assets/{src => }/themes/basic/theme.json (100%)
 rename client/assets/{src => }/themes/cli/style.css (100%)
 rename client/assets/{src => }/themes/cli/theme.json (100%)
 rename client/assets/{src => }/themes/mini/style.css (100%)
 rename client/assets/{src => }/themes/mini/theme.json (100%)
 rename client/assets/{src => }/themes/relaxed/style.css (99%)
 rename client/assets/{src => }/themes/relaxed/theme.json (100%)

diff --git a/client/assets/src/app.js b/client/assets/src/app.js
index 15abc2d..6320c5f 100644
--- a/client/assets/src/app.js
+++ b/client/assets/src/app.js
@@ -116,7 +116,7 @@ _kiwi.global = {
 
         if (opts.server_settings.client.themes) {
             _.each(opts.server_settings.client.themes, function (theme) {
-                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/>');
+                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/>');
                 link.disabled = true;
                 $(link).appendTo($('head'));
             });
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 0a38341..9eed0f4 100644
--- 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 6413dd1..4b5aa7e 100644
--- 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 80bec4c..22c27de 100644
--- 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);
         }
-- 
2.25.1