#topic & #tabs -> .topic & .tabs

diff --git a/client/assets/css/style.css b/client/assets/css/style.css
index 6c650cf2051f9a0722039dca7f04810ed41a6a9a..868105c114f8a7f343b2325f7c3ea07e1f1332d4 100644 (file)
--- a/client/assets/css/style.css
+++ b/client/assets/css/style.css
@@ -27,7 +27,7 @@ html, body { height:100%; }
 }
 
 
-#kiwi .toolbar #tabs { margin-right: 200px; }
+#kiwi .toolbar .tabs { margin-right: 200px; }
 #kiwi .toolbar .panellist {
     overflow: hidden;
     display:block;
@@ -152,8 +152,8 @@ html, body { height:100%; }
 /**
  * Topic bar
  */
-#kiwi #topic { position:relative; height:2em; }
-#kiwi #topic div {
+#kiwi .toolbar .topic { position:relative; height:2em; }
+#kiwi .toolbar .topic div {
     position:absolute;
     top:0; bottom:0; left:0; right:0;
     overflow: hidden;
@@ -540,8 +540,8 @@ html, body { height:100%; }
 
 
 
-#kiwi.theme_relaxed #topic { background-color:#1B1B1B; padding-bottom:2px; }
-#kiwi.theme_relaxed #topic div {
+#kiwi.theme_relaxed .toolbar .topic { background-color:#1B1B1B; padding-bottom:2px; }
+#kiwi.theme_relaxed .toolbar .topic div {
     padding: 0.2em 1em;
     text-align: center;
     box-shadow: none;
@@ -552,7 +552,7 @@ html, body { height:100%; }
     outline: none;
     white-space: nowrap;
 }
-#kiwi.theme_relaxed #topic:hover div {
+#kiwi.theme_relaxed .toolbar .topic:hover div {
     min-height:1.5em;
     white-space:pre-wrap; word-wrap:break-word;
     overflow:visible;
@@ -564,7 +564,7 @@ html, body { height:100%; }
 
 
 #kiwi.theme_relaxed .toolbar .app_tools { width:200px; padding-left:10px; color:#D4D4D4; }
-#kiwi.theme_relaxed.narrow .toolbar #tabs { margin-right:0; }
+#kiwi.theme_relaxed.narrow .toolbar .tabs { margin-right:0; }
 #kiwi.theme_relaxed.narrow .toolbar .app_tools { width:auto; }
 #kiwi.theme_relaxed .toolbar .app_tools ul li {
     font-size:26px;
@@ -615,10 +615,10 @@ html, body { height:100%; }
 #kiwi.theme_relaxed.chanlist_treeview .toolbar { position:static; }
 #kiwi.theme_relaxed.chanlist_treeview .toolbar .app_tools { float:none; }
 #kiwi.theme_relaxed.chanlist_treeview .toolbar > div { margin-left:160px; }
-#kiwi.theme_relaxed.chanlist_treeview .toolbar #tabs { position:absolute; left:0px; bottom:0px; top:0px; margin:0; width:160px; background:#1B1B1B; overflow-y:auto; }
-#kiwi.theme_relaxed.chanlist_treeview #tabs ul li { display:block; float:none; }
-#kiwi.theme_relaxed.chanlist_treeview #tabs ul li .activity { position:absolute; right:5px; }
-#kiwi.theme_relaxed.chanlist_treeview #tabs ul li.active {
+#kiwi.theme_relaxed.chanlist_treeview .toolbar .tabs { position:absolute; left:0px; bottom:0px; top:0px; margin:0; width:160px; background:#1B1B1B; overflow-y:auto; }
+#kiwi.theme_relaxed.chanlist_treeview .tabs ul li { display:block; float:none; }
+#kiwi.theme_relaxed.chanlist_treeview .tabs ul li .activity { position:absolute; right:5px; }
+#kiwi.theme_relaxed.chanlist_treeview .tabs ul li.active {
     margin-right:0;
     border-right-width:0;
     border-bottom-right-radius:0;
@@ -703,7 +703,7 @@ html, body { height:100%; }
     background-color: #eee;
 }
 
-#kiwi.theme_mini .toolbar #tabs { margin-right:0 !important; }
+#kiwi.theme_mini .toolbar .tabs { margin-right:0 !important; }
 #kiwi.theme_mini .toolbar .panellist .alert_highlight { font-weight:bold; }
 #kiwi.theme_mini .toolbar .panellist .alert_activity { font-weight:normal; }
 #kiwi.theme_mini .toolbar .panellist .alert_action { font-weight:normal; }
@@ -821,8 +821,8 @@ html, body { height:100%; }
 
 
 
-#kiwi.theme_mini #topic { display:none; }
-#kiwi.theme_mini #topic div {
+#kiwi.theme_mini .toolbar .topic { display:none; }
+#kiwi.theme_mini .toolbar .topic div {
     top:2; bottom:2px; left:0; width:100%;
     padding: 0.2em 1em;
     text-align: center;
@@ -931,8 +931,8 @@ html, body { height:100%; }
     padding-left:0.5em;
 }
 
-#kiwi.theme_cli #topic { background:#111111; height:2em; border-bottom:1px solid #444444; border-top:1px solid #444444; }
-#kiwi.theme_cli #topic div {
+#kiwi.theme_cli .toolbar .topic { background:#111111; height:2em; border-bottom:1px solid #444444; border-top:1px solid #444444; }
+#kiwi.theme_cli .toolbar .topic div {
     width:100%; height: 1.5em;
     padding: 0.2em 1em;
     text-align: center;
@@ -941,7 +941,7 @@ html, body { height:100%; }
     overflow: hidden;
     white-space: nowrap;
 }
-#kiwi.theme_cli #topic:hover div {
+#kiwi.theme_cli .toolbar .topic:hover div {
     min-height:1.5em;
     white-space:pre-wrap; word-wrap:break-word;
     overflow:visible;
@@ -1127,10 +1127,10 @@ html, body { height:100%; }
 #kiwi.theme_cli.chanlist_treeview .toolbar { position:static; }
 #kiwi.theme_cli.chanlist_treeview .toolbar .app_tools { float:none; }
 #kiwi.theme_cli.chanlist_treeview .toolbar > div { }
-#kiwi.theme_cli.chanlist_treeview .toolbar #tabs { position:absolute; left:0px; bottom:0px; top:0px; margin:0; width:200px; background:#1B1B1B; overflow-y:auto; }
-#kiwi.theme_cli.chanlist_treeview #tabs ul li { display:block; float:none; }
-#kiwi.theme_cli.chanlist_treeview #tabs ul li .activity { float:right; }
-#kiwi.theme_cli.chanlist_treeview #tabs ul li.active { padding-left:1em; }
+#kiwi.theme_cli.chanlist_treeview .toolbar .tabs { position:absolute; left:0px; bottom:0px; top:0px; margin:0; width:200px; background:#1B1B1B; overflow-y:auto; }
+#kiwi.theme_cli.chanlist_treeview .tabs ul li { display:block; float:none; }
+#kiwi.theme_cli.chanlist_treeview .tabs ul li .activity { float:right; }
+#kiwi.theme_cli.chanlist_treeview .tabs ul li.active { padding-left:1em; }
 
 
 #kiwi.theme_cli .ui_menu {
@@ -1193,7 +1193,7 @@ html, body { height:100%; }
     background-color: #eee;
 }
 
-#kiwi.theme_basic .toolbar #tabs { margin-right:0 !important; }
+#kiwi.theme_basic .toolbar .tabs { margin-right:0 !important; }
 #kiwi.theme_basic .toolbar .panellist .alert_highlight { font-weight:bold; color:red; }
 #kiwi.theme_basic .toolbar .panellist .alert_activity { font-weight:normal; color:green; }
 #kiwi.theme_basic .toolbar .panellist .alert_action { font-weight:normal; color:green; }
@@ -1357,8 +1357,8 @@ html, body { height:100%; }
 
 
 
-#kiwi.theme_basic #topic {  }
-#kiwi.theme_basic #topic div {
+#kiwi.theme_basic .toolbar .topic {  }
+#kiwi.theme_basic .toolbar .topic div {
     top:2; bottom:2px; left:0; width:100%;
     padding: 0.2em 1em;
     text-align: center;
@@ -1369,7 +1369,7 @@ html, body { height:100%; }
     overflow: hidden;
     outline: none;
 }
-#kiwi.theme_basic #topic:hover div {
+#kiwi.theme_basic .toolbar .topic:hover div {
     min-height:1.5em;
     white-space:pre-wrap; word-wrap:break-word;
     overflow:visible;
@@ -1430,10 +1430,10 @@ html, body { height:100%; }
 #kiwi.theme_basic.chanlist_treeview .toolbar { position:static; }
 #kiwi.theme_basic.chanlist_treeview .toolbar .app_tools { float:none; }
 #kiwi.theme_basic.chanlist_treeview .toolbar > div { margin-left:160px; }
-#kiwi.theme_basic.chanlist_treeview .toolbar #tabs { position:absolute; left:0px; bottom:0px; top:0px; margin:0; width:160px; background:#1B1B1B; overflow-y:auto; }
-#kiwi.theme_basic.chanlist_treeview #tabs ul li { display:block; float:none; }
-#kiwi.theme_basic.chanlist_treeview #tabs ul li .activity { float:right; }
-#kiwi.theme_basic.chanlist_treeview #tabs ul li.active {
+#kiwi.theme_basic.chanlist_treeview .toolbar .tabs { position:absolute; left:0px; bottom:0px; top:0px; margin:0; width:160px; background:#1B1B1B; overflow-y:auto; }
+#kiwi.theme_basic.chanlist_treeview .tabs ul li { display:block; float:none; }
+#kiwi.theme_basic.chanlist_treeview .tabs ul li .activity { float:right; }
+#kiwi.theme_basic.chanlist_treeview .tabs ul li.active {
     margin-right:0;
     border-right-width:0;
     border-bottom-right-radius:0;

diff --git a/client/assets/dev/index.html.tmpl b/client/assets/dev/index.html.tmpl
index 84e7a7e6eb2c4c98ad9fc26752aefb1b4a4bb691..edb0e1d2df15fb1194bbb4467762502901adc0d9 100644 (file)
--- a/client/assets/dev/index.html.tmpl
+++ b/client/assets/dev/index.html.tmpl
@@ -23,9 +23,9 @@
                 </ul>\r
             </div>\r
 \r
-            <div id="tabs"></div>\r
+            <div class="tabs"></div>\r
 \r
-            <div id="topic">\r
+            <div class="topic">\r
                 <div contenteditable="true"></div>\r
             </div>\r
 \r

diff --git a/client/assets/dev/model_application.js b/client/assets/dev/model_application.js
index 91da42eaf3a919724d4f6b47463218b9792c4c87..7dd3cdc8517eed4e9364d69cbca87469ed099d9f 100644 (file)
--- a/client/assets/dev/model_application.js
+++ b/client/assets/dev/model_application.js
@@ -109,7 +109,7 @@ _kiwi.model.Application = function () {
             // Applets panel list\r
             this.applet_panels = new _kiwi.model.PanelList();\r
             this.applet_panels.view.$el.addClass('panellist applets');\r
-            this.view.$el.find('#tabs').append(this.applet_panels.view.$el);\r
+            this.view.$el.find('.tabs').append(this.applet_panels.view.$el);\r
 \r
             /**\r
              * Set the UI components up\r
@@ -117,7 +117,7 @@ _kiwi.model.Application = function () {
             this.controlbox = new _kiwi.view.ControlBox({el: $('#controlbox')[0]});\r
             this.bindControllboxCommands(this.controlbox);\r
 \r
-            this.topicbar = new _kiwi.view.TopicBar({el: $('#topic')[0]});\r
+            this.topicbar = new _kiwi.view.TopicBar({el: this.view.$el.find('.topic')[0]});\r
 \r
             new _kiwi.view.AppToolbar({el: _kiwi.app.view.$el.find('.toolbar .app_tools')[0]});\r
 \r

diff --git a/client/assets/dev/view.js b/client/assets/dev/view.js
index c5f965fa0c8d8e15abccbdbc42501a99cd34be17..03a6b3b2dfa4aece03b380de974ade7483cae610 100644 (file)
--- a/client/assets/dev/view.js
+++ b/client/assets/dev/view.js
@@ -744,7 +744,7 @@ _kiwi.view.NetworkTabs = Backbone.View.extend({
         this.model.on('add', this.networkAdded, this);\r
         this.model.on('remove', this.networkRemoved, this);\r
 \r
-        this.$el.appendTo($('#kiwi #tabs'));\r
+        this.$el.appendTo($('#kiwi .tabs'));\r
     },\r
 \r
     networkAdded: function(network) {\r
@@ -1033,7 +1033,7 @@ _kiwi.view.ControlBox = Backbone.View.extend({
 \r
         case (ev.keyCode === 219 && meta):            // [ + meta\r
             // Find all the tab elements and get the index of the active tab\r
-            var $tabs = $('#kiwi #tabs').find('li[class!=connection]');\r
+            var $tabs = $('#kiwi .tabs').find('li[class!=connection]');\r
             var cur_tab_ind = (function() {\r
                 for (var idx=0; idx<$tabs.length; idx++){\r
                     if ($($tabs[idx]).hasClass('active'))\r
@@ -1053,7 +1053,7 @@ _kiwi.view.ControlBox = Backbone.View.extend({
 \r
         case (ev.keyCode === 221 && meta):            // ] + meta\r
             // Find all the tab elements and get the index of the active tab\r
-            var $tabs = $('#kiwi #tabs').find('li[class!=connection]');\r
+            var $tabs = $('#kiwi .tabs').find('li[class!=connection]');\r
             var cur_tab_ind = (function() {\r
                 for (var idx=0; idx<$tabs.length; idx++){\r
                     if ($($tabs[idx]).hasClass('active'))\r
@@ -1430,7 +1430,7 @@ _kiwi.view.Application = Backbone.View.extend({
 \r
         // If we have channel tabs on the side, adjust the height\r
         if (el_kiwi.hasClass('chanlist_treeview')) {\r
-            $('#tabs', el_kiwi).css(css_heights);\r
+            this.$el.find('.tabs', el_kiwi).css(css_heights);\r
         }\r
 \r
         // Determine if we have a narrow window (mobile/tablet/or even small desktop window)\r