Add ability to control URL on embedded wizard page, as well as updating the about page and various other URLs.

Author: retropc

bin/optionsgen.py

@@ -1,5 +1,5 @@
 import config, simplejson
 
 def get_options():
-  options = dict(networkName=config.NETWORK_NAME, networkServices=[config.AUTH_SERVICE], loginRegex=config.  AUTH_OK_REGEX, appTitle=config.APP_TITLE)
+  options = dict(networkName=config.NETWORK_NAME, networkServices=[config.AUTH_SERVICE], loginRegex=config.  AUTH_OK_REGEX, appTitle=config.APP_TITLE, baseURL=config.BASE_URL)
   return simplejson.dumps(options)

config.py.example

@@ -8,6 +8,8 @@ REALNAME = "http://moo.com/"
 MAXLINELEN = 600
 IDENT = "webchat"   # set this value to None if you'd like a hex representation of the IP
 
+BASE_URL = "http://foo.foo.org/"
+
 FEEDBACK_FROM = "[email protected]"
 FEEDBACK_TO = "[email protected]"
 FEEDBACK_SMTP_HOST = "127.0.0.1"

js/qwebircinterface.js

@@ -8,7 +8,8 @@ qwebirc.ui.Interface = new Class({
     loginRegex: null,
     appTitle: "ExampleNetwork Web IRC",
     searchURL: true,
-    theme: undefined
+    theme: undefined,
+    baseURL: null
   },
   initialize: function(element, ui, options) {
     this.setOptions(options);

js/ui/baseui.js

@@ -34,9 +34,9 @@ qwebirc.ui.BaseUI = new Class({
     if(!this.firstClient) {
       this.firstClient = true;
       w.addLine("", "qwebirc v" + qwebirc.VERSION);
-      w.addLine("", "Copyright (C) 2008-2009 Chris Porter. All rights reserved.");
-      w.addLine("", "http://webchat.quakenet.org/");
-      w.addLine("", "This is BETA quality software, please report bugs to [email protected]");
+      w.addLine("", "Copyright (C) 2008-2009 Chris Porter and the qwebirc project.");
+      w.addLine("", "http://www.qwebirc.org");
+      w.addLine("", "Licensed under the GNU General Public License, Version 2.");
     }
     return w;
   },
@@ -260,7 +260,7 @@ qwebirc.ui.StandardUI = new Class({
     d.setSubWindow(ew);
   },
   embeddedWindow: function() {
-    this.addCustomWindow("Embedding wizard", qwebirc.ui.EmbedWizard, "embeddedwizard");
+    this.addCustomWindow("Embedding wizard", qwebirc.ui.EmbedWizard, "embeddedwizard", {baseURL: this.options.baseURL});
   },
   optionsWindow: function() {
     this.addCustomWindow("Options", qwebirc.ui.OptionsPane, "optionspane", this.uiOptions);

static/panes/about.html

@@ -8,11 +8,10 @@
   </table>
 </div>
 <div class="mainbody">
-  Copyright &copy; 2008-2009 Chris Porter.<br/>All rights reserved.
-
+  Copyright &copy; 2008-2009 Chris Porter and the qwebirc project.<br/>All rights reserved.<br/><br/>
+  Licensed under the GNU General Public License, version 2 only.
   <p>
-    <a href="http://webchat.quakenet.org/" target="new">http://webchat.quakenet.org/</a><br/>
-    For licensing questions please contact [email protected].
+    <a href="http://www.qwebirc.org/" target="new">http://www.qwebirc.org/</a><br/>
   </p>
   <p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
   <p>This software contains portions by the following third parties:</p>