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
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
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 ..
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
}
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");
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"]
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]