Plugin (Utilityview) tabs in a different toolbar

diff --git a/css/default.css b/css/default.css
index b0bc56bccca3196d3f864885fb51de26204dfdde..bda917a040cf0edf46b8ae68c8c750a81566ed94 100644 (file)
--- a/css/default.css
+++ b/css/default.css
@@ -32,19 +32,19 @@ body, html {
 #kiwi.small_kiwi .messages { right:10px; }\r
 \r
 \r
-#kiwi .windowlist {\r
+#kiwi .windowlist, #kiwi .utilityviewlist {\r
        /*height: 65px;*/\r
        background-color:#1B1B1B;\r
        font-size:0.9em;\r
 }\r
-#kiwi .windowlist ul {\r
+#kiwi .windowlist ul, #kiwi .utilityviewlist ul {\r
        overflow: hidden;\r
        margin-right: 200px;\r
        white-space: nowrap;\r
        display:block;\r
        /*height: 35px;*/\r
 }\r
-#kiwi .windowlist ul li {\r
+#kiwi .windowlist ul li, #kiwi .utilityviewlist ul li {\r
        float: left;\r
        list-style: inline;\r
        padding:5px;\r
@@ -63,14 +63,14 @@ body, html {
        -khtml-border-radius:5px;\r
        behavior: url(border-radius.htc);\r
 }\r
-#kiwi .windowlist .active { padding-right:23px; }\r
-#kiwi .windowlist .highlight {\r
+#kiwi .windowlist .active, #kiwi .utilityviewlist .active { padding-right:23px; }\r
+#kiwi .windowlist .highlight, #kiwi .utilityviewlist .highlight {\r
        background-color: #990000;\r
        font-weight: bold;\r
 }\r
-#kiwi .windowlist .activity { font-weight: bold; background-color: #009900; }\r
+#kiwi .windowlist .activity, #kiwi .utilityviewlist .activity { font-weight: bold; background-color: #009900; }\r
 \r
-#kiwi .windowlist ul li img { width:1em; height:1em; top:7px; right:5px; position:absolute; }\r
+#kiwi .windowlist ul li img, #kiwi .utilityviewlist ul li img { width:1em; height:1em; top:7px; right:5px; position:absolute; }\r
 /*#kiwi .windowlist ul li a {\r
        margin:3px;\r
        border: 1px solid #333;\r

diff --git a/js/front.js b/js/front.js
index 1b8eae166d9cf7099b003a15463db4b189aec286..7f46057f559887140cdd405825a10d82afb11ef2 100644 (file)
--- a/js/front.js
+++ b/js/front.js
@@ -1158,7 +1158,7 @@ var Utilityview = function (name, src) {
 
     if (!front.tabviewExists(name)) {
         $('#kiwi .windows .scroller').append('<div id="' + tmp_divname + '" class="messages"></div>');
-        $('#kiwi .windowlist ul').append('<li id="' + tmp_tabname + '" onclick="front.tabviews[\'' + name.toLowerCase() + '\'].show();">' + name + '</li>');
+        $('#kiwi .utilityviewlist ul').append('<li id="' + tmp_tabname + '" onclick="front.tabviews[\'' + name.toLowerCase() + '\'].show();">' + name + '</li>');
     }
     
     this.div = $('#' + tmp_divname);
@@ -1181,10 +1181,10 @@ Utilityview.prototype.topic = ' ';
 Utilityview.prototype.show = function () {
     $('#kiwi .messages').removeClass("active");
     $('#kiwi .userlist ul').removeClass("active");
-    $('#kiwi .windowlist ul li').removeClass("active");
+    $('#kiwi .toolbars ul li').removeClass("active");
 
     $('#windows').css('overflow-y', 'hidden');
-
+    $('#windows').css('right', 0);
     // Activate this tab!
     this.div.addClass('active');
     this.tab.addClass('active');
@@ -1229,7 +1229,7 @@ Utilityview.prototype.addPartImage = function () {
 };
 
 Utilityview.prototype.clearPartImage = function () {
-    $('#kiwi .windowlist .tab_part').remove();
+    $('#kiwi .toolbars .tab_part').remove();
 };
 
 
@@ -1257,7 +1257,7 @@ Tabview.prototype.show = function () {
 
     $('#kiwi .messages').removeClass("active");
     $('#kiwi .userlist ul').removeClass("active");
-    $('#kiwi .windowlist ul li').removeClass("active");
+    $('#kiwi .toolbars ul li').removeClass("active");
     
     w = $('#windows');
     u = $('#kiwi .userlist');
@@ -1330,7 +1330,7 @@ Tabview.prototype.addPartImage = function () {
 };
 
 Tabview.prototype.clearPartImage = function () {
-    $('#kiwi .windowlist .tab_part').remove();
+    $('#kiwi .toolbars .tab_part').remove();
 };
 
 Tabview.prototype.addMsg = function (time, nick, msg, type, style) {

diff --git a/node/client/index.html.jade b/node/client/index.html.jade
index bc66243d1ea59cea043781f9e66fd31024899b08..12ec9d53322bb37ddfcd05456d96d65991291f6c 100644 (file)
--- a/node/client/index.html.jade
+++ b/node/client/index.html.jade
@@ -22,6 +22,7 @@ html(xmlns="http://www.w3.org/1999/xhtml", lang="en-gb")
         //script(type="text/javascript", src="js/front.js")
         //script(type="text/javascript", src="js/iscroll.js")
         script(type="text/javascript", src="js/all.js")
+        script(type="text/javascript", src="js/plugins.js")
 
         - if (touchscreen)
             script(type="text/javascript", src="js/touchscreen_tweaks.js")
@@ -147,6 +148,9 @@ html(xmlns="http://www.w3.org/1999/xhtml", lang="en-gb")
                     div.poweredby Powered by Kiwi IRC
                     ul
 
+                div.utilityviewlist
+                    ul
+
                 div.cur_topic(contenteditable="true", spellcheck="true")
                     //
                         ul.edit(style="float:right;")