Reorganise.

diff --git a/.hgignore b/.hgignore
index 55d0a8e4cd23fcbb1c1db3d686a39c5c955e9c2a..6356fae4ff44664f3c2763d35615d0f28c96f925 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -1,4 +1,5 @@
 syntax: glob
+static\js\debug
 qwebirc\config.py
 dropin.cache
 *.tap

diff --git a/compile.bat b/compile.bat
index beb84ccc30d9002f2a85fdfec5226d70de7413fa..df0485333a0acb27c4cc845919023f7ee7a98b68 100644 (file)
--- a/compile.bat
+++ b/compile.bat
@@ -1,9 +1,9 @@
 @echo off\r
 del compiled.js\r
 del concat.js\r
-cd static\js\r
-copy version.js + jslib.js + irc\ircconnection.js + irc\irclib.js + irc\baseirc.js + irc\irctracker.js + irc\commandparser.js + irc\ircclient.js + ui\uibase.js + ui\colour.js + ui\theme.js + ui\uglyui.js ..\..\concat.js /b\r
-cd ..\..\r
+cd js\r
+copy version.js + jslib.js + irc\ircconnection.js + irc\irclib.js + irc\baseirc.js + irc\irctracker.js + irc\commandparser.js + irc\ircclient.js + ui\uibase.js + ui\colour.js + ui\theme.js + ui\uglyui.js ..\concat.js /b\r
+cd ..\r
 java -jar bin\yuicompressor-2.3.5.jar concat.js > compiled.js\r
 \r
 if %errorlevel% == 0 goto ok\r
@@ -14,6 +14,7 @@ goto ene
 \r
 :ok\r
 del concat.js\r
+copy js\copyright.js + compiled.js /b static\js\qwebirc.js\r
 goto end\r
 \r
 :end\r

diff --git a/js/copyright.js b/js/copyright.js
new file mode 100644 (file)
index 0000000..21b9828
--- /dev/null
+++ b/js/copyright.js
@@ -0,0 +1,2 @@
+/* qwebirc -- Copyright (C) 2008 Chris Porter --- All rights reserved. */\r
+\r

diff --git a/static/js/irc/baseirc.js b/js/irc/baseirc.js
similarity index 100%
rename from static/js/irc/baseirc.js
rename to js/irc/baseirc.js

diff --git a/static/js/irc/commandparser.js b/js/irc/commandparser.js
similarity index 100%
rename from static/js/irc/commandparser.js
rename to js/irc/commandparser.js

diff --git a/static/js/irc/ircclient.js b/js/irc/ircclient.js
similarity index 100%
rename from static/js/irc/ircclient.js
rename to js/irc/ircclient.js

diff --git a/static/js/irc/ircconnection.js b/js/irc/ircconnection.js
similarity index 100%
rename from static/js/irc/ircconnection.js
rename to js/irc/ircconnection.js

diff --git a/static/js/irc/irclib.js b/js/irc/irclib.js
similarity index 100%
rename from static/js/irc/irclib.js
rename to js/irc/irclib.js

diff --git a/static/js/irc/irctracker.js b/js/irc/irctracker.js
similarity index 100%
rename from static/js/irc/irctracker.js
rename to js/irc/irctracker.js

diff --git a/static/js/irc/version.js b/js/irc/version.js
similarity index 100%
rename from static/js/irc/version.js
rename to js/irc/version.js

diff --git a/static/js/jslib.js b/js/jslib.js
similarity index 100%
rename from static/js/jslib.js
rename to js/jslib.js

diff --git a/static/js/ui/basetheme.js b/js/ui/basetheme.js
similarity index 100%
rename from static/js/ui/basetheme.js
rename to js/ui/basetheme.js

diff --git a/static/js/ui/colour.js b/js/ui/colour.js
similarity index 100%
rename from static/js/ui/colour.js
rename to js/ui/colour.js

diff --git a/static/js/ui/theme.js b/js/ui/theme.js
similarity index 100%
rename from static/js/ui/theme.js
rename to js/ui/theme.js

diff --git a/static/js/ui/uglyui.js b/js/ui/uglyui.js
similarity index 100%
rename from static/js/ui/uglyui.js
rename to js/ui/uglyui.js

diff --git a/static/js/ui/uibase.js b/js/ui/uibase.js
similarity index 100%
rename from static/js/ui/uibase.js
rename to js/ui/uibase.js

diff --git a/static/js/version.js b/js/version.js
similarity index 100%
rename from static/js/version.js
rename to js/version.js

diff --git a/static/css/colours.css b/static/css/colours.css
index 5b465510557f573ac569ed66ce894b8e8c9f6933..5aa9c9275027ffa4bd007b397204589b69744746 100644 (file)
--- a/static/css/colours.css
+++ b/static/css/colours.css
@@ -1,102 +1,102 @@
-.Xc0 {\r
+.qwebircline .Xc0 {\r
   color: white;\r
 }\r
-.Xc1 {\r
+.qwebircline .Xc1 {\r
   color: black;\r
 }\r
-.Xc2 {\r
+.qwebircline .Xc2 {\r
   color: darkBlue;\r
 }\r
-.Xc3 {\r
+.qwebircline .Xc3 {\r
   color: darkGreen;\r
 }\r
-.Xc4 {\r
+.qwebircline .Xc4 {\r
   color: red;\r
 }\r
-.Xc5 {\r
+.qwebircline .Xc5 {\r
   color: darkRed;\r
 }\r
-.Xc6 {\r
+.qwebircline .Xc6 {\r
   color: purple;\r
 }\r
-.Xc7 {\r
+.qwebircline .Xc7 {\r
   color: orange;\r
 }\r
-.Xc8 {\r
+.qwebircline .Xc8 {\r
   color: yellow;\r
 }\r
-.Xc9 {\r
+.qwebircline .Xc9 {\r
   color: green;\r
 }\r
-.Xc10 {\r
+.qwebircline .Xc10 {\r
   color: teal;\r
 }\r
-.Xc11 {\r
+.qwebircline .Xc11 {\r
   color: cyan;\r
 }\r
-.Xc12 {\r
+.qwebircline .Xc12 {\r
   color: blue;\r
 }\r
-.Xc13 {\r
+.qwebircline .Xc13 {\r
   color: fuchsia;\r
 }\r
-.Xc14 {\r
+.qwebircline .Xc14 {\r
   color: darkGray;\r
 }\r
-.Xc15 {\r
+.qwebircline .Xc15 {\r
   color: gray;\r
 }\r
-.Xbc0 {\r
+.qwebircline .Xbc0 {\r
   background-color: white;\r
 }\r
-.Xbc1 {\r
+.qwebircline .Xbc1 {\r
   background-color: black;\r
 }\r
-.Xbc2 {\r
+.qwebircline .Xbc2 {\r
   background-color: darkBlue;\r
 }\r
-.Xbc3 {\r
+.qwebircline .Xbc3 {\r
   background-color: darkGreen;\r
 }\r
-.Xbc4 {\r
+.qwebircline .Xbc4 {\r
   background-color: red;\r
 }\r
-.Xbc5 {\r
+.qwebircline .Xbc5 {\r
   background-color: darkRed;\r
 }\r
-.Xbc6 {\r
+.qwebircline .Xbc6 {\r
   background-color: purple;\r
 }\r
-.Xbc7 {\r
+.qwebircline .Xbc7 {\r
   background-color: orange;\r
 }\r
-.Xbc8 {\r
+.qwebircline .Xbc8 {\r
   background-color: yellow;\r
 }\r
-.Xbc9 {\r
+.qwebircline .Xbc9 {\r
   background-color: green;\r
 }\r
-.Xbc10 {\r
+.qwebircline .Xbc10 {\r
   background-color: teal;\r
 }\r
-.Xbc11 {\r
+.qwebircline .Xbc11 {\r
   background-color: cyan;\r
 }\r
-.Xbc12 {\r
+.qwebircline .Xbc12 {\r
   background-color: blue;\r
 }\r
-.Xbc13 {\r
+.qwebircline .Xbc13 {\r
   background-color: fuchsia;\r
 }\r
-.Xbc14 {\r
+.qwebircline .Xbc14 {\r
   background-color: darkGray;\r
 }\r
-.Xbc15 {\r
+.qwebircline .Xbc15 {\r
   background-color: gray;\r
 }\r
-.Xb {\r
+.qwebircline .Xb {\r
   font-weight: bold;\r
 }\r
-.Xu {\r
+.qwebircline .Xu {\r
   text-decoration: underline;\r
 }\r

diff --git a/static/uitest.html b/static/uitest.html
index 2e5b58eab92038d40ebb20bf00d1f189c286ec8f..473ca7563cf5d6a6776876649dde46e3935afd7a 100644 (file)
--- a/static/uitest.html
+++ b/static/uitest.html
@@ -5,18 +5,20 @@
   <title>QuakeNet Web IRC</title>\r
   <link rel="stylesheet" href="css/colours.css" type="text/css">\r
   <script type="text/javascript" src="js/mootools-1.2-core.js"></script>\r
-  <script type="text/javascript" src="js/version.js"></script>\r
-  <script type="text/javascript" src="js/jslib.js"></script>\r
-  <script type="text/javascript" src="js/irc/ircconn.js"></script>\r
-  <script type="text/javascript" src="js/irc/irclib.js"></script>\r
-  <script type="text/javascript" src="js/irc/baseirc.js"></script>\r
-  <script type="text/javascript" src="js/irc/irctracker.js"></script>\r
-  <script type="text/javascript" src="js/irc/commandparser.js"></script>\r
-  <script type="text/javascript" src="js/irc/ircclient.js"></script>\r
-  <script type="text/javascript" src="js/ui/uibase.js"></script>\r
-  <script type="text/javascript" src="js/ui/colour.js"></script>\r
-  <script type="text/javascript" src="js/ui/theme.js"></script>\r
-  <script type="text/javascript" src="js/ui/uglyui.js"></script>\r
+  <!--\r
+  <script type="text/javascript" src="js/debug/version.js"></script>\r
+  <script type="text/javascript" src="js/debug/jslib.js"></script>\r
+  <script type="text/javascript" src="js/debug/irc/ircconn.js"></script>\r
+  <script type="text/javascript" src="js/debug/irc/irclib.js"></script>\r
+  <script type="text/javascript" src="js/debug/irc/baseirc.js"></script>\r
+  <script type="text/javascript" src="js/debug/irc/irctracker.js"></script>\r
+  <script type="text/javascript" src="js/debug/irc/commandparser.js"></script>\r
+  <script type="text/javascript" src="js/debug/irc/ircclient.js"></script>\r
+  <script type="text/javascript" src="js/debug/ui/uibase.js"></script>\r
+  <script type="text/javascript" src="js/debug/ui/colour.js"></script>\r
+  <script type="text/javascript" src="js/debug/ui/theme.js"></script>\r
+  <script type="text/javascript" src="js/debug/ui/uglyui.js"></script>-->\r
+  <script type="text/javascript" src="js/qwebirc.js"></script>\r
   <script type="text/javascript">  \r
     window.addEvent("domready", function() {\r
       var theme = new Theme();\r