Client: Folder restructure

diff --git a/client/assets/plugin_example.html b/client/assets/plugins/plugin_example.html
similarity index 100%
rename from client/assets/plugin_example.html
rename to client/assets/plugins/plugin_example.html

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

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

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

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

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

diff --git a/client/assets/dev/build.js b/client/assets/src/build.js
similarity index 71%
rename from client/assets/dev/build.js
rename to client/assets/src/build.js
index dd68457033c50e5d53abb7969c843a3f3c408ba3..313f1e2c3e7e3755b6636d2d5b25f5fd1e20eb48 100644 (file)
--- a/client/assets/dev/build.js
+++ b/client/assets/src/build.js
@@ -30,26 +30,26 @@ config.loadConfig();
 \r
 var src = concat([\r
     __dirname + '/app.js',\r
-    __dirname + '/model_application.js',\r
-    __dirname + '/model_gateway.js',\r
-    __dirname + '/model_network.js',\r
-    __dirname + '/model_member.js',\r
-    __dirname + '/model_memberlist.js',\r
-    __dirname + '/model_newconnection.js',\r
-    __dirname + '/model_panel.js',\r
-    __dirname + '/model_panellist.js',\r
-    __dirname + '/model_networkpanellist.js',\r
-    __dirname + '/model_query.js',\r
-    __dirname + '/model_channel.js',\r
-    __dirname + '/model_server.js',\r
-    __dirname + '/model_applet.js',\r
-    __dirname + '/model_pluginmanager.js',\r
-    __dirname + '/model_datastore.js',\r
-\r
-    __dirname + '/applet_settings.js',\r
-    __dirname + '/applet_nickserv.js',\r
-    __dirname + '/applet_chanlist.js',\r
-    __dirname + '/applet_scripteditor.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/query.js',\r
+    __dirname + '/models/channel.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/nickserv.js',\r
+    __dirname + '/applets/chanlist.js',\r
+    __dirname + '/applets/scripteditor.js',\r
 \r
     __dirname + '/utils.js',\r
     __dirname + '/view.js'\r

diff --git a/client/assets/dev/index.html.tmpl b/client/assets/src/index.html.tmpl
similarity index 91%
rename from client/assets/dev/index.html.tmpl
rename to client/assets/src/index.html.tmpl
index ae7f0f8dfb56246c7a888111ab4b0f314df413c6..9362683a4f568d487f0fdd1ae9e235104ff71d48 100644 (file)
--- a/client/assets/dev/index.html.tmpl
+++ b/client/assets/src/index.html.tmpl
@@ -287,40 +287,40 @@
         if (getQueryVariable('debug')) {\r
             console.log('Loading debugging scripts');\r
             scripts = scripts.concat([\r
-                'dev/app.js',\r
+                'src/app.js',\r
                 [\r
-                    'dev/model_application.js',\r
-                    'dev/model_gateway.js'\r
+                    'src/models/application.js',\r
+                    'src/models/gateway.js'\r
                 ],\r
                 [\r
-                    'dev/model_newconnection.js',\r
-                    'dev/model_panellist.js',\r
-                    'dev/model_networkpanellist.js',\r
-                    'dev/model_panel.js',\r
-                    'dev/model_member.js',\r
-                    'dev/model_memberlist.js',\r
-                    'dev/model_network.js'\r
+                    'src/models/newconnection.js',\r
+                    'src/models/panellist.js',\r
+                    'src/models/networkpanellist.js',\r
+                    'src/models/panel.js',\r
+                    'src/models/member.js',\r
+                    'src/models/memberlist.js',\r
+                    'src/models/network.js'\r
                 ],\r
                 \r
                 [\r
-                    'dev/model_query.js',\r
-                    'dev/model_channel.js',\r
-                    'dev/model_server.js',\r
-                    'dev/model_applet.js'\r
+                    'src/models/query.js',\r
+                    'src/models/channel.js',\r
+                    'src/models/server.js',\r
+                    'src/models/applet.js'\r
                 ],\r
 \r
                 [\r
-                    'dev/applet_settings.js',\r
-                    'dev/applet_nickserv.js',\r
-                    'dev/applet_chanlist.js',\r
-                    'dev/applet_scripteditor.js'\r
+                    'src/applets/settings.js',\r
+                    'src/applets/nickserv.js',\r
+                    'src/applets/chanlist.js',\r
+                    'src/applets/scripteditor.js'\r
                 ],\r
 \r
                 [\r
-                    'dev/model_pluginmanager.js',\r
-                    'dev/model_datastore.js',\r
-                    'dev/utils.js',\r
-                    'dev/view.js'\r
+                    'src/models/pluginmanager.js',\r
+                    'src/models/datastore.js',\r
+                    'src/utils.js',\r
+                    'src/view.js'\r
                 ]\r
             ]);\r
         } else {\r

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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