From: Darren <darren@Darrens-MacBook-Pro.local>
Date: Sun, 21 Apr 2013 15:04:08 +0000 (+0100)
Subject: Merge with development branch
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=69193a64eff8f2bb1c8b72c95edc2da99393ec50;p=KiwiIRC.git

Merge with development branch
---

69193a64eff8f2bb1c8b72c95edc2da99393ec50
diff --cc client/assets/dev/view.js
index cc4513b,7f916a8..23bd6f7
--- a/client/assets/dev/view.js
+++ b/client/assets/dev/view.js
@@@ -677,11 -733,11 +739,12 @@@ _kiwi.view.Tabs = Backbone.View.extend(
  
          if (panel.isServer()) {
              panel.tab.addClass('server');
+             panel.tab.addClass('icon-nonexistant');
          }
  
 -        panel.tab.data('panel_id', panel.cid)
 -            .appendTo(panel.isApplet() ? this.tabs_applets : this.tabs_msg);
 +        panel.tab.data('panel', panel)
 +            .appendTo(this.$el);
 +            //.appendTo(panel.isApplet() ? this.tabs_applets : this.tabs_msg);
  
          panel.bind('change:title', this.updateTabTitle);
          _kiwi.app.view.doLayout();