#controlbox -> .controlbox

diff --git a/client/assets/css/style.css b/client/assets/css/style.css
index b7447e52d248bbf6d59a0315e1ec7c164684dc03..d6a92115a3af4bba4e79db740681daf87e87f724 100644 (file)
--- a/client/assets/css/style.css
+++ b/client/assets/css/style.css
@@ -21,7 +21,7 @@ html, body { height:100%; }
 #kiwi .toolbar { position:absolute; top:0px; width:100%; display:none; }
 #kiwi .panels { position:absolute; left:0px; right:200px; bottom:100px; top:100px; }
 #kiwi .memberlists { position:absolute; right:0px; width:200px; bottom:100px; top:100px; overflow-y:auto; }
-#kiwi #controlbox { position: absolute; bottom:0px; width:100%; display:none; }
+#kiwi .controlbox { position: absolute; bottom:0px; width:100%; display:none; }
 #kiwi .memberlists_resize_handle {
     position: absolute; width:10px; z-index:1; cursor:w-resize;
 }
@@ -120,32 +120,32 @@ html, body { height:100%; }
 /**
  * Control box
  */
-#kiwi #controlbox .input {
+#kiwi .controlbox .input {
     height:1.7em; position:relative;
 }
 
 /* The nick label */
-#kiwi #controlbox .input .nick { cursor: pointer; }
-#kiwi #controlbox .input .nick a { }
+#kiwi .controlbox .input .nick { cursor: pointer; }
+#kiwi .controlbox .input .nick a { }
 
 /* Wrapper div around the text area input */
-#kiwi #controlbox .input .input_wrap { display:inline; }
+#kiwi .controlbox .input .input_wrap { display:inline; }
 
 /* The textarea input */
-#kiwi #controlbox .input .inp { white-space: nowrap; }
+#kiwi .controlbox .input .inp { white-space: nowrap; }
 
 
 /* Nick change dialog showed when clicking the nick label */
-#kiwi #controlbox .nickchange {
+#kiwi .controlbox .nickchange {
     position: absolute;
     background: #FFF;
 }
-#kiwi #controlbox .nickchange input { }
-#kiwi #controlbox .nickchange button { }
+#kiwi .controlbox .nickchange input { }
+#kiwi .controlbox .nickchange button { }
 
 /* Plugin tools */
-#kiwi #controlbox .input_tools { float:right; }
-#kiwi #controlbox .input_tools .tool { margin:0 1em; display:inline; }
+#kiwi .controlbox .input_tools { float:right; }
+#kiwi .controlbox .input_tools .tool { margin:0 1em; display:inline; }
 
 
 
@@ -317,7 +317,7 @@ html, body { height:100%; }
 #kiwi.theme_relaxed .toolbar {
     background-color:#1B1B1B; font-size:0.9em;
 }
-#kiwi.theme_relaxed #controlbox { background-color:#1B1B1B; }
+#kiwi.theme_relaxed .controlbox { background-color:#1B1B1B; }
 #kiwi.theme_relaxed .memberlists_resize_handle {
     /*background:url('../img/resize_handle.png') no-repeat; background-position:center;*/
 }
@@ -499,7 +499,7 @@ html, body { height:100%; }
 #kiwi.theme_relaxed .memberlists ul li.mode.a .prefix { display:inline-block; background:#b54747; }
 #kiwi.theme_relaxed .memberlists ul li.mode.q .prefix { display:inline-block; background:#8547b5; }
 
-#kiwi.theme_relaxed #controlbox .input {
+#kiwi.theme_relaxed .controlbox .input {
     background:#fff; margin:3px;
     height:1.7em;
     border-radius:5px;
@@ -507,18 +507,18 @@ html, body { height:100%; }
     -webkit-border-radius:5px;
     -khtml-border-radius:5px;
 }
-#kiwi.theme_relaxed #controlbox .input .nick { text-align: right; width:11em; left:0px; position:absolute; padding:2px; overflow:hidden; }
-#kiwi.theme_relaxed #controlbox .input .nick a { text-decoration:none; color:black; }
+#kiwi.theme_relaxed .controlbox .input .nick { text-align: right; width:11em; left:0px; position:absolute; padding:2px; overflow:hidden; }
+#kiwi.theme_relaxed .controlbox .input .nick a { text-decoration:none; color:black; }
 
-#kiwi.theme_relaxed.narrow #controlbox .input .nick { display:none; }
-#kiwi.theme_relaxed.narrow #controlbox .input .input_wrap { left:7px; }
+#kiwi.theme_relaxed.narrow .controlbox .input .nick { display:none; }
+#kiwi.theme_relaxed.narrow .controlbox .input .input_wrap { left:7px; }
 
-#kiwi.theme_relaxed #controlbox .input .input_wrap {
+#kiwi.theme_relaxed .controlbox .input .input_wrap {
     position:absolute;
     right:7px; left: 12.2em;
     height:1.7em;
 }
-#kiwi.theme_relaxed #controlbox .input .inp {
+#kiwi.theme_relaxed .controlbox .input .inp {
     line-height:1.7em;
     border: medium none;
     box-shadow: none;
@@ -531,12 +531,12 @@ html, body { height:100%; }
 }
 
 
-#kiwi.theme_relaxed #controlbox .nickchange {
+#kiwi.theme_relaxed .controlbox .nickchange {
     padding:10px; left: 0px;
     background: #1B1B1B; color:#eeeeee;
 }
-#kiwi.theme_relaxed #controlbox .nickchange input { padding:0.3em 0.5em; }
-#kiwi.theme_relaxed #controlbox .nickchange button { padding:0.5em; }
+#kiwi.theme_relaxed .controlbox .nickchange input { padding:0.3em 0.5em; }
+#kiwi.theme_relaxed .controlbox .nickchange button { padding:0.5em; }
 
 
 
@@ -686,7 +686,7 @@ html, body { height:100%; }
 #kiwi.theme_mini .toolbar {
     background-color:#1B1B1B; font-size:0.9em;
 }
-#kiwi.theme_mini #controlbox { background-color:#1B1B1B; }
+#kiwi.theme_mini .controlbox { background-color:#1B1B1B; }
 #kiwi.theme_mini .memberlists_resize_handle {
     display:none; width:0;
 }
@@ -788,18 +788,18 @@ html, body { height:100%; }
 #kiwi.theme_mini .userbox a i { font-size:1.1em; margin-right:5px; }
 
 
-#kiwi.theme_mini #controlbox .input {
+#kiwi.theme_mini .controlbox .input {
     background:#fff; margin:3px;
     height:1.7em;
 }
-#kiwi.theme_mini #controlbox .input .nick { display:none; }
-#kiwi.theme_mini #controlbox .input .nick a { text-decoration:none; color:black; }
-#kiwi.theme_mini #controlbox .input .input_wrap {
+#kiwi.theme_mini .controlbox .input .nick { display:none; }
+#kiwi.theme_mini .controlbox .input .nick a { text-decoration:none; color:black; }
+#kiwi.theme_mini .controlbox .input .input_wrap {
     position:absolute;
     right:3px; left:3px;
     height:1.7em;
 }
-#kiwi.theme_mini #controlbox .input .inp {
+#kiwi.theme_mini .controlbox .input .inp {
     line-height:1.7em;
     border: medium none;
     box-shadow: none;
@@ -812,12 +812,12 @@ html, body { height:100%; }
 }
 
 
-#kiwi.theme_mini #controlbox .nickchange {
+#kiwi.theme_mini .controlbox .nickchange {
     padding:10px; left: 0px;
     background: #1B1B1B; color:#eeeeee;
 }
-#kiwi.theme_mini #controlbox .nickchange input { padding:0.3em 0.5em; }
-#kiwi.theme_mini #controlbox .nickchange button { padding:0.5em; }
+#kiwi.theme_mini .controlbox .nickchange input { padding:0.3em 0.5em; }
+#kiwi.theme_mini .controlbox .nickchange button { padding:0.5em; }
 
 
 
@@ -906,16 +906,16 @@ html, body { height:100%; }
     font-size:14px; line-height:1.4em;
 }
 
-#kiwi.theme_cli #controlbox { background:#111111; border-top:1px solid #444444; color:#909090; font-size:1.3em; line-height:2em; }
-#kiwi.theme_cli #controlbox .input_wrap:before { content:"> " }
-#kiwi.theme_cli #controlbox .input { background:none; border:none;}
-#kiwi.theme_cli #controlbox .input .nick { line-height:1.7em; padding:0; text-align: right; width:11em; left:0px; position:absolute; overflow:hidden; }
-#kiwi.theme_cli #controlbox .input .input_wrap {
+#kiwi.theme_cli .controlbox { background:#111111; border-top:1px solid #444444; color:#909090; font-size:1.3em; line-height:2em; }
+#kiwi.theme_cli .controlbox .input_wrap:before { content:"> " }
+#kiwi.theme_cli .controlbox .input { background:none; border:none;}
+#kiwi.theme_cli .controlbox .input .nick { line-height:1.7em; padding:0; text-align: right; width:11em; left:0px; position:absolute; overflow:hidden; }
+#kiwi.theme_cli .controlbox .input .input_wrap {
     position:absolute;
     right:7px; left: 12.2em;
     height:1.7em;
 }
-#kiwi.theme_cli #controlbox .input .inp {
+#kiwi.theme_cli .controlbox .input .inp {
     line-height:1.4em;
     font-size:1.3em;
     background:transparent; color:#909090;
@@ -1176,7 +1176,7 @@ html, body { height:100%; }
 #kiwi.theme_basic .toolbar {
     background-color:#1B1B1B; font-size:0.9em;
 }
-#kiwi.theme_basic #controlbox { background-color:#1B1B1B; }
+#kiwi.theme_basic .controlbox { background-color:#1B1B1B; }
 #kiwi.theme_basic .memberlists_resize_handle {
     /*display:none; width:0;*/
 }
@@ -1315,11 +1315,11 @@ html, body { height:100%; }
 #kiwi.theme_basic .userbox a i { font-size:1.1em; margin-right:5px; }
 
 
-#kiwi.theme_basic #controlbox .input {
+#kiwi.theme_basic .controlbox .input {
     background:#fff; margin:3px;
     height:1.7em;
 }
-#kiwi.theme_basic #controlbox .input .nick {
+#kiwi.theme_basic .controlbox .input .nick {
     text-align: right;
     width: 11em;
     left: 0px;
@@ -1327,14 +1327,14 @@ html, body { height:100%; }
     padding: 2px;
     overflow: hidden;
 }
-#kiwi.theme_basic #controlbox .input .nick:after { content:">"; margin-left:3px; top:2px; }
-#kiwi.theme_basic #controlbox .input .nick a { text-decoration:none; color:black; }
-#kiwi.theme_basic #controlbox .input .input_wrap {
+#kiwi.theme_basic .controlbox .input .nick:after { content:">"; margin-left:3px; top:2px; }
+#kiwi.theme_basic .controlbox .input .nick a { text-decoration:none; color:black; }
+#kiwi.theme_basic .controlbox .input .input_wrap {
     position:absolute;
     right:3px; left:12em;
     height:1.7em;
 }
-#kiwi.theme_basic #controlbox .input .inp {
+#kiwi.theme_basic .controlbox .input .inp {
     line-height:1.7em;
     border: medium none;
     box-shadow: none;
@@ -1348,12 +1348,12 @@ html, body { height:100%; }
 }
 
 
-#kiwi.theme_basic #controlbox .nickchange {
+#kiwi.theme_basic .controlbox .nickchange {
     padding:10px; left: 0px;
     background: #1B1B1B; color:#eeeeee;
 }
-#kiwi.theme_basic #controlbox .nickchange input { padding:0.3em 0.5em; }
-#kiwi.theme_basic #controlbox .nickchange button { padding:0.5em; }
+#kiwi.theme_basic .controlbox .nickchange input { padding:0.3em 0.5em; }
+#kiwi.theme_basic .controlbox .nickchange button { padding:0.5em; }
 
 
 

diff --git a/client/assets/dev/index.html.tmpl b/client/assets/dev/index.html.tmpl
index 422177a8ddb2e972854f84536712f132d9192f1d..4ecb5210459beea98c4ce0a18dfadc2a91744ccc 100644 (file)
--- a/client/assets/dev/index.html.tmpl
+++ b/client/assets/dev/index.html.tmpl
@@ -40,7 +40,7 @@
 \r
         <div class="memberlists" class="disabled"></div>\r
 \r
-        <div id="controlbox">\r
+        <div class="controlbox">\r
             <div class="input">\r
                 <span class="nick"> </span>\r
                 <div class="input_wrap"><textarea class="inp"></textarea></div>\r

diff --git a/client/assets/dev/model_application.js b/client/assets/dev/model_application.js
index ae209d4eded8e8ad53c1363c602d9b8f543c4be5..aa5a6ca908ee1b4ecc1054ffde66f305cd2ad31a 100644 (file)
--- a/client/assets/dev/model_application.js
+++ b/client/assets/dev/model_application.js
@@ -114,7 +114,7 @@ _kiwi.model.Application = function () {
             /**\r
              * Set the UI components up\r
              */\r
-            this.controlbox = new _kiwi.view.ControlBox({el: $('#controlbox')[0]});\r
+            this.controlbox = new _kiwi.view.ControlBox({el: $('#kiwi .controlbox')[0]});\r
             this.bindControllboxCommands(this.controlbox);\r
 \r
             this.topicbar = new _kiwi.view.TopicBar({el: this.view.$el.find('.topic')[0]});\r

diff --git a/client/assets/dev/view.js b/client/assets/dev/view.js
index 35e07f800bd7a9a2555d631b696ff1bdda629506..d5dce4616acbd2d1473ab10d727a5db3828ac436 100644 (file)
--- a/client/assets/dev/view.js
+++ b/client/assets/dev/view.js
@@ -1307,7 +1307,7 @@ _kiwi.view.Application = Backbone.View.extend({
 \r
         $(window).resize(function() { that.doLayout.apply(that); });\r
         this.$el.find('.toolbar').resize(function() { that.doLayout.apply(that); });\r
-        $('#controlbox').resize(function() { that.doLayout.apply(that); });\r
+        $('#kiwi .controlbox').resize(function() { that.doLayout.apply(that); });\r
 \r
         // Change the theme when the config is changed\r
         _kiwi.global.settings.on('change:theme', this.updateTheme, this);\r
@@ -1396,7 +1396,7 @@ _kiwi.view.Application = Backbone.View.extend({
             return;\r
         }\r
 \r
-        $('#controlbox .inp').focus();\r
+        $('#kiwi .controlbox .inp').focus();\r
     },\r
 \r
 \r
@@ -1405,7 +1405,7 @@ _kiwi.view.Application = Backbone.View.extend({
         var el_panels = $('#kiwi .panels');\r
         var el_memberlists = $('#kiwi .memberlists');\r
         var el_toolbar = this.$el.find('.toolbar');\r
-        var el_controlbox = $('#kiwi #controlbox');\r
+        var el_controlbox = $('#kiwi .controlbox');\r
         var el_resize_handle = $('#kiwi .memberlists_resize_handle');\r
 \r
         var css_heights = {\r
@@ -1453,7 +1453,7 @@ _kiwi.view.Application = Backbone.View.extend({
             el_resize_handle.css('left', el_panels.outerWidth(true));\r
         }\r
 \r
-        var input_wrap_width = parseInt($('#kiwi #controlbox .input_tools').outerWidth());\r
+        var input_wrap_width = parseInt($('#kiwi .controlbox .input_tools').outerWidth());\r
         el_controlbox.find('.input_wrap').css('right', input_wrap_width + 7);\r
     },\r
 \r
@@ -1534,10 +1534,10 @@ _kiwi.view.Application = Backbone.View.extend({
 \r
         if (!instant) {\r
             this.$el.find('.toolbar').slideUp({queue: false, duration: 400, step: $.proxy(this.doLayout, this)});\r
-            $('#controlbox').slideUp({queue: false, duration: 400, step: $.proxy(this.doLayout, this)});\r
+            $('#kiwi .controlbox').slideUp({queue: false, duration: 400, step: $.proxy(this.doLayout, this)});\r
         } else {\r
             this.$el.find('.toolbar').slideUp(0);\r
-            $('#controlbox').slideUp(0);\r
+            $('#kiwi .controlbox').slideUp(0);\r
             this.doLayout();\r
         }\r
     },\r
@@ -1547,10 +1547,10 @@ _kiwi.view.Application = Backbone.View.extend({
 \r
         if (!instant) {\r
             this.$el.find('.toolbar').slideDown({queue: false, duration: 400, step: $.proxy(this.doLayout, this)});\r
-            $('#controlbox').slideDown({queue: false, duration: 400, step: $.proxy(this.doLayout, this)});\r
+            $('#kiwi .controlbox').slideDown({queue: false, duration: 400, step: $.proxy(this.doLayout, this)});\r
         } else {\r
             this.$el.find('.toolbar').slideDown(0);\r
-            $('#controlbox').slideDown(0);\r
+            $('#kiwi .controlbox').slideDown(0);\r
             this.doLayout();\r
         }\r
     },\r