Reorganise panes and ui frontends.

diff --git a/compile.bat b/compile.bat
index 1ab6aa97f41750113b953eb7c70d7747055038c9..ed8179ad663d9d30f4ef7112d590a312d6e91452 100644 (file)
--- a/compile.bat
+++ b/compile.bat
@@ -5,8 +5,8 @@ mkdir compiled
 del /q compiled\*.js\r
 \r
 cd js\r
-copy qwebirc.js + version.js + jslib.js + irc\ircconnection.js + irc\irclib.js + irc\numerics.js + irc\baseircclient.js + irc\irctracker.js + irc\commandparser.js + irc\ircclient.js + ui\baseui.js + ui\baseuiwindow.js + ui\colour.js + ui\url.js + ui\theme.js + ui\genericlogin.js + ui\embedwizard.js + qwebircinterface.js + irc\commandhistory.js + ui\hilightcontroller.js + ui\menuitems.js + ui\tabcompleter.js + ui\optionspane.js + ui\aboutpane.js + auth.js + sound.js ..\compiled\qwebirc-concat.js /b\r
-copy ui\swmui.js + ui\swmlayout.js ..\compiled\swmui-concat.js /b\r
+copy qwebirc.js + version.js + jslib.js + irc\ircconnection.js + irc\irclib.js + irc\numerics.js + irc\baseircclient.js + irc\irctracker.js + irc\commandparser.js + irc\ircclient.js + ui\baseui.js + ui\baseuiwindow.js + ui\colour.js + ui\url.js + ui\theme.js + ui\panes\connect.js + ui\panes\embed.js + qwebircinterface.js + irc\commandhistory.js + ui\hilightcontroller.js + ui\menuitems.js + ui\tabcompleter.js + ui\panes\options.js + ui\panes\about.js + auth.js + sound.js ..\compiled\qwebirc-concat.js /b\r
+copy ui\frontends\swmui.js + ui\frontends\swmlayout.js ..\compiled\swmui-concat.js /b\r
 cd ..\compiled\r
 \r
 java -jar ..\bin\yuicompressor-2.3.5.jar ..\static\js\mochaui\mocha.js > mocha-compressed.js\r
@@ -15,16 +15,16 @@ if not %errorlevel% == 0 goto error
 java -jar ..\bin\yuicompressor-2.3.5.jar qwebirc-concat.js > qwebirc-compiled.js\r
 if not %errorlevel% == 0 goto error\r
 \r
-java -jar ..\bin\yuicompressor-2.3.5.jar ..\js\ui\uglyui.js > uglyui-compiled.js\r
+java -jar ..\bin\yuicompressor-2.3.5.jar ..\js\ui\frontends\uglyui.js > uglyui-compiled.js\r
 if not %errorlevel% == 0 goto error\r
 \r
 java -jar ..\bin\yuicompressor-2.3.5.jar swmui-concat.js > swmui-compiled.js\r
 if not %errorlevel% == 0 goto error\r
 \r
-java -jar ..\bin\yuicompressor-2.3.5.jar ..\js\ui\mochaui.js > mochaui-compiled.js\r
+java -jar ..\bin\yuicompressor-2.3.5.jar ..\js\ui\frontends\mochaui.js > mochaui-compiled.js\r
 if not %errorlevel% == 0 goto error\r
 \r
-java -jar ..\bin\yuicompressor-2.3.5.jar ..\js\ui\qui.js > qui-compiled.js\r
+java -jar ..\bin\yuicompressor-2.3.5.jar ..\js\ui\frontends\qui.js > qui-compiled.js\r
 if not %errorlevel% == 0 goto error\r
 \r
 goto ok\r

diff --git a/compile.sh b/compile.sh
index 26297487f68ebfa5f2c1e22df5831b63a2b9f70e..59fdce27c627059c113f0b8cd9889a9134a353db 100755 (executable)
--- a/compile.sh
+++ b/compile.sh
@@ -5,8 +5,8 @@ mkdir -p compiled
 rm -f compiled/*.js
 
 cd js
-cat qwebirc.js version.js jslib.js irc/ircconnection.js irc/irclib.js irc/numerics.js irc/baseircclient.js irc/irctracker.js irc/commandparser.js irc/ircclient.js ui/baseui.js ui/baseuiwindow.js ui/colour.js ui/url.js ui/theme.js ui/genericlogin.js ui/embedwizard.js irc/commandhistory.js ui/hilightcontroller.js ui/menuitems.js ui/tabcompleter.js ui/optionspane.js ui/aboutpane.js qwebircinterface.js auth.js sound.js > ../compiled/qwebirc-concat.js
-cat ui/swmui.js ui/swmlayout.js > ../compiled/swmui-concat.js
+cat qwebirc.js version.js jslib.js irc/ircconnection.js irc/irclib.js irc/numerics.js irc/baseircclient.js irc/irctracker.js irc/commandparser.js irc/ircclient.js ui/baseui.js ui/baseuiwindow.js ui/colour.js ui/url.js ui/theme.js ui/panes/connect.js ui/panes/embed.js irc/commandhistory.js ui/hilightcontroller.js ui/menuitems.js ui/tabcompleter.js ui/panes/options.js ui/panes/about.js qwebircinterface.js auth.js sound.js > ../compiled/qwebirc-concat.js
+cat ui/frontends/swmui.js ui/frontends/swmlayout.js > ../compiled/swmui-concat.js
 
 error() {
   cd ..
@@ -42,10 +42,10 @@ cd ..
 xjarit ../static/js/mochaui/mocha ../static/js/mochaui/mocha-compressed
 
 jarit qwebirc-concat qwebirc
-jarit ../js/ui/uglyui uglyui
+jarit ../js/ui/frontends/uglyui uglyui
 jarit swmui-concat swmui
-jarit ../js/ui/mochaui mochaui
-jarit ../js/ui/qui qui
+jarit ../js/ui/frontends/mochaui mochaui
+jarit ../js/ui/frontends/qui qui
 
 rm compiled/{swmui,qwebirc}-concat.js
 

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

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

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

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

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

diff --git a/js/ui/aboutpane.js b/js/ui/panes/about.js
similarity index 100%
rename from js/ui/aboutpane.js
rename to js/ui/panes/about.js

diff --git a/js/ui/genericlogin.js b/js/ui/panes/connect.js
similarity index 95%
rename from js/ui/genericlogin.js
rename to js/ui/panes/connect.js
index 756957d2aae9a4d6635b900573c74560d760e51d..8f0ba4aeda6bddfc037eafea2e9f3489b48b40a0 100644 (file)
--- a/js/ui/genericlogin.js
+++ b/js/ui/panes/connect.js
@@ -44,7 +44,10 @@ qwebirc.ui.ConfirmBox = function(parentElement, callback, initialNickname, initi
   }
   
   text.appendChild(document.createTextNode(" click 'Connect'."));
- 
+  text.appendChild(new Element("br"));
+  if(!qwebirc.auth.loggedin())
+    text.appendChild(document.createTextNode("If you'd like to connect using your Q auth click 'Log in'."));
+
   var tr = new Element("tr");
   tbody.appendChild(tr);
   tr.addClass("tr2");

diff --git a/js/ui/embedwizard.js b/js/ui/panes/embed.js
similarity index 100%
rename from js/ui/embedwizard.js
rename to js/ui/panes/embed.js

diff --git a/js/ui/optionspane.js b/js/ui/panes/options.js
similarity index 100%
rename from js/ui/optionspane.js
rename to js/ui/panes/options.js

diff --git a/pagegen.py b/pagegen.py
index 61763bde54774cef9edb1a027cc4ddb72a233c51..171ce9cdceb0ae2bf9e1ea1d3de8ba3982561420 100644 (file)
--- a/pagegen.py
+++ b/pagegen.py
@@ -1,7 +1,7 @@
 import os, sys
 
 IRC_BASE = ["ircconnection", "irclib", "numerics", "baseircclient", "irctracker", "commandparser", "ircclient", "commandhistory"]
-UI_BASE = ["baseui", "baseuiwindow", "colour", "url", "theme", "genericlogin", "embedwizard", "hilightcontroller", "menuitems", "tabcompleter", "optionspane", "aboutpane"]
+UI_BASE = ["baseui", "baseuiwindow", "colour", "url", "theme", "hilightcontroller", "menuitems", "tabcompleter", "panes/connect", "panes/embed", "panes/options", "panes/about"]
 
 DEBUG_BASE = ["qwebirc", "version", "jslib", ["irc/%s" % x for x in IRC_BASE], ["ui/%s" % x for x in UI_BASE], "qwebircinterface", "auth", "sound"]
 BUILD_BASE = ["qwebirc"]
@@ -64,7 +64,7 @@ DEBUG = ["debug/%s" % x for x in flatten(DEBUG_BASE)]
 def jslist(name, debug):
   ui = UIs[name]
   if debug:
-    x = [JS_BASE, ui.get("extra", []), DEBUG, ["debug/ui/%s" % y for y in ui["uifiles"]]]
+    x = [JS_BASE, ui.get("extra", []), DEBUG, ["debug/ui/frontends/%s" % y for y in ui["uifiles"]]]
   else:
     x = [JS_BASE, ui.get("buildextra", ui.get("extra", [])), BUILD_BASE, name]