From: Darren <darren@darrenwhitlen.com>
Date: Tue, 2 Oct 2012 18:31:04 +0000 (+0100)
Subject: Server tab icons #52 #53
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=72371b1ad271f81ee09e7eaf916941bef9a46d27;p=KiwiIRC.git

Server tab icons #52 #53
---

diff --git a/client_backbone/css/style.css b/client_backbone/css/style.css
index bc3e3ae..72aae7c 100644
--- a/client_backbone/css/style.css
+++ b/client_backbone/css/style.css
@@ -74,7 +74,8 @@ a { color:#36C; text-decoration:none; cursor:pointer; }
 #toolbar .panellist li img { width:1em; height:1em; top:7px; right:5px; position:absolute; }
 #toolbar .panellist li img.icon { left:5px; top:2px; height:auto; width:auto; }
 
-
+#toolbar .panellist li.server span { background:url(../img/server_tab.png) no-repeat; padding-left:23px; }
+#toolbar .panellist li span  { line-height:20px; vertical-align:middle; display:block; }
 #status_message {
     background: #FEEFB3; color: #9F6000;
     border-bottom: 1px solid;
diff --git a/client_backbone/dev/model_panel.js b/client_backbone/dev/model_panel.js
index ac123d4..e0fd88f 100755
--- a/client_backbone/dev/model_panel.js
+++ b/client_backbone/dev/model_panel.js
@@ -90,5 +90,9 @@ kiwi.model.Panel = Backbone.Model.extend({
 
     isApplet: function () {
         return this.applet ? true : false;
+    },
+
+    isServer: function () {
+        return this.server ? true : false;
     }
 });
\ No newline at end of file
diff --git a/client_backbone/dev/model_server.js b/client_backbone/dev/model_server.js
index af5ee1d..eb64e14 100755
--- a/client_backbone/dev/model_server.js
+++ b/client_backbone/dev/model_server.js
@@ -1,4 +1,7 @@
 kiwi.model.Server = kiwi.model.Panel.extend({
+    // Used to determine if this is a server panel
+    server: true,
+
     server_login: null,
 
     initialize: function (attributes) {
diff --git a/client_backbone/dev/view.js b/client_backbone/dev/view.js
index 0875285..1ee929b 100755
--- a/client_backbone/dev/view.js
+++ b/client_backbone/dev/view.js
@@ -459,7 +459,6 @@ kiwi.view.Tabs = Backbone.View.extend({
 
         this.tabs_applets = $('ul.applets', this.$el);
         this.tabs_msg = $('ul.channels', this.$el);
-        window.t = this;
 
         kiwi.gateway.on('change:name', function (gateway, new_val) {
             $('span', this.model.server.tab).text(new_val);
@@ -495,6 +494,11 @@ kiwi.view.Tabs = Backbone.View.extend({
     panelAdded: function (panel) {
         // Add a tab to the panel
         panel.tab = $('<li><span>' + (panel.get('title') || panel.get('name')) + '</span></li>');
+
+        if (panel.isServer()) {
+            panel.tab.addClass('server');
+        }
+
         panel.tab.data('panel_id', panel.cid)
             .appendTo(panel.isApplet() ? this.tabs_applets : this.tabs_msg);
 
@@ -515,7 +519,11 @@ kiwi.view.Tabs = Backbone.View.extend({
         this.tabs_msg.children().removeClass('active');
 
         panel.tab.addClass('active');
-        panel.tab.append('<img src="img/redcross.png" />');
+
+        // Only show the part image on non-server tabs
+        if (!panel.isServer()) {
+            panel.tab.append('<img src="img/redcross.png" />');
+        }
     },
 
     tabClick: function (e) {
diff --git a/client_backbone/img/server_tab.png b/client_backbone/img/server_tab.png
new file mode 100644
index 0000000..19eb313
Binary files /dev/null and b/client_backbone/img/server_tab.png differ