Add currently empty privacy policy.

diff --git a/compile.bat b/compile.bat
index ed8179ad663d9d30f4ef7112d590a312d6e91452..1f1950858004142feeada2903d5154642de4b10e 100644 (file)
--- a/compile.bat
+++ b/compile.bat
@@ -5,7 +5,7 @@ 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\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 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 + ui\panes\privacypolicy.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

diff --git a/compile.sh b/compile.sh
index 59fdce27c627059c113f0b8cd9889a9134a353db..dd1993d02d86e2a05e6665ebaa4bdc8c54bab9db 100755 (executable)
--- a/compile.sh
+++ b/compile.sh
@@ -5,7 +5,7 @@ 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/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 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 ui/panes/privacypolicy.js > ../compiled/qwebirc-concat.js
 cat ui/frontends/swmui.js ui/frontends/swmlayout.js > ../compiled/swmui-concat.js
 
 error() {

diff --git a/js/irc/commandparser.js b/js/irc/commandparser.js
index a8300d3bd363bce36552f8fbbedd42f98ca6164d..255db328e609783d0acfa901acaa95acb704a8f4 100644 (file)
--- a/js/irc/commandparser.js
+++ b/js/irc/commandparser.js
@@ -115,6 +115,7 @@ qwebirc.irc.CommandParser = new Class({
       "MSG": "PRIVMSG",
       "Q": "QUERY",
       "BACK": "AWAY",
+      "PRIVACY": "PRIVACYPOLICY",
       "HOP": "CYCLE"
     };
   },
@@ -204,6 +205,9 @@ qwebirc.irc.CommandParser = new Class({
   cmd_EMBED: [false, undefined, undefined, function(args) {
     this.newUIWindow("embeddedWindow");
   }],
+  cmd_PRIVACYPOLICY: [false, undefined, undefined, function(args) {
+    this.newUIWindow("privacyWindow");
+  }],
   cmd_ABOUT: [false, undefined, undefined, function(args) {
     this.newUIWindow("aboutWindow");
   }],

diff --git a/js/ui/baseui.js b/js/ui/baseui.js
index 52b148c0d879bdb4d839ce19c1090ea4184ab25b..6e576a9ea1887b416e5c089bb539149a6c587335 100644 (file)
--- a/js/ui/baseui.js
+++ b/js/ui/baseui.js
@@ -250,7 +250,7 @@ qwebirc.ui.StandardUI = new Class({
     }.bind(this));
   },
   embeddedWindow: function() {
-    this.addCustomWindow("Embedded Wizard", qwebirc.ui.EmbedWizard, "embeddedwizard");
+    this.addCustomWindow("Embedding wizard", qwebirc.ui.EmbedWizard, "embeddedwizard");
   },
   optionsWindow: function() {
     this.addCustomWindow("Options", qwebirc.ui.OptionsPane, "optionspane", this.uiOptions);
@@ -258,6 +258,9 @@ qwebirc.ui.StandardUI = new Class({
   aboutWindow: function() {
     this.addCustomWindow("About", qwebirc.ui.AboutPane, "aboutpane", this.uiOptions);
   },
+  privacyWindow: function() {
+    this.addCustomWindow("Privacy policy", qwebirc.ui.PrivacyPolicyPane, "privacypolicypane", this.uiOptions);
+  },
   urlDispatcher: function(name) {
     if(name == "embedded")
       return ["a", this.embeddedWindow.bind(this)];

diff --git a/js/ui/frontends/qui.js b/js/ui/frontends/qui.js
index 5380befbec343cdc55ba5c52cb4861991e3142ab..71112a341a4a3c9601c5fd155ef646b502f82a7c 100644 (file)
--- a/js/ui/frontends/qui.js
+++ b/js/ui/frontends/qui.js
@@ -35,7 +35,7 @@ qwebirc.ui.QUI = new Class({
         this.nextWindow();
       } else if(event.wheel < 0) {
         /* down */
-        this.prevWindow();        
+        this.prevWindow();
       }
       event.stop();
     }.bind(this));
@@ -446,11 +446,11 @@ qwebirc.ui.QUI.Window = new Class({
     
     this.parentObject.tabs.removeChild(this.tab);
   },
-  addLine: function(type, line, colour) {
+  addLine: function(type, line, colourClass) {
     var e = new Element("div");
 
-    if(colour) {
-      e.setStyles({"background": colour});
+    if(colourClass) {
+      e.addClass(colourClass);
     } else if(this.lastcolour) {
       e.addClass("linestyle1");
     } else {
@@ -458,7 +458,7 @@ qwebirc.ui.QUI.Window = new Class({
     }
     this.lastcolour = !this.lastcolour;
 
-    this.parent(type, line, colour, e);
+    this.parent(type, line, colourClass, e);
   },
   setHilighted: function(state) {
     laststate = this.hilighted;

diff --git a/js/ui/panes/privacypolicy.js b/js/ui/panes/privacypolicy.js
new file mode 100644 (file)
index 0000000..22a8eaa
--- /dev/null
+++ b/js/ui/panes/privacypolicy.js
@@ -0,0 +1,12 @@
+qwebirc.ui.PrivacyPolicyPane = new Class({\r
+  Implements: [Events],\r
+  initialize: function(parent) {\r
+    parent.set("html", " Loading. . .");\r
+    var r = new Request.HTML({url: "privacypolicy.html", update: parent, onSuccess: function() {\r
+      parent.getElement("input[class=close]").addEvent("click", function() {\r
+        this.fireEvent("close");\r
+      }.bind(this));\r
+    }.bind(this)});\r
+    r.send();\r
+  }\r
+});\r

diff --git a/pagegen.py b/pagegen.py
index 171ce9cdceb0ae2bf9e1ea1d3de8ba3982561420..1993f3c1007c79ee15485cab67236c8736ba1549 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", "hilightcontroller", "menuitems", "tabcompleter", "panes/connect", "panes/embed", "panes/options", "panes/about"]
+UI_BASE = ["baseui", "baseuiwindow", "colour", "url", "theme", "hilightcontroller", "menuitems", "tabcompleter", "panes/connect", "panes/embed", "panes/options", "panes/about", "panes/privacypolicy"]
 
 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"]

diff --git a/static/privacypolicy.html b/static/privacypolicy.html
new file mode 100644 (file)
index 0000000..cd35a81
--- /dev/null
+++ b/static/privacypolicy.html
@@ -0,0 +1,18 @@
+<div class="header">\r
+  <table>\r
+    <tr>\r
+      <td><img src="/images/qwebircsmall.png" alt="qwebirc" title="qwebirc"/></td>\r
+      <td>&nbsp;&nbsp;&nbsp;&nbsp;</td>\r
+      <td><div class="title">qwebirc</div><div>Privacy Policy</div></td>\r
+    </tr>\r
+  </table>\r
+</div>\r
+<div class="mainbody">\r
+  <ul>\r
+    <li>moo</li>\r
+    <li>moo</li>\r
+    <li>moo</li>\r
+    <li>moo</li>\r
+  </ul>\r
+  <input type="submit" value="Close" class="close" />\r
+</div>\r