Channel key option in server select dialog changes

diff --git a/client/assets/css/style.css b/client/assets/css/style.css
index 3ccdd638bcad1cca3a15236eef925dff1b3cbcd1..c2c997b4c8046884504d80af490a2692d3bb8c83 100644 (file)
--- a/client/assets/css/style.css
+++ b/client/assets/css/style.css
@@ -181,6 +181,17 @@ html, body { height:100%; }
 #kiwi .server_select.single_server .basic { border:none; }
 #kiwi .server_select .status {  }
 
+/* Channel key icon */
+#kiwi .server_select .basic tr.channel td { position: relative; }
+#kiwi .server_select .basic tr.channel .icon-key {
+    position: absolute;
+    top: 1.2em;
+    right: 0.7em;
+    font-size: 1.3em;
+    cursor: pointer;
+}
+#kiwi .server_select .basic tr.have_key { display:none; }
+
 /* When connected to an IRC server, .ok is set on the status div */
 #kiwi .server_select .status.ok { }
 
@@ -1087,6 +1098,8 @@ html, body { height:100%; }
     padding:0.5em; margin-top:1em; margin-bottom:1em; margin-right:2em;
 }
 
+#kiwi.theme_cli .server_select .basic tr.channel .icon-key { color:#555; }
+
 
 #kiwi.theme_cli .server_select .kiwi_logo { margin-top:30px; text-align:center; display:block; }
 #kiwi.theme_cli .server_select .kiwi_logo h1 {

diff --git a/client/assets/dev/index.html.tmpl b/client/assets/dev/index.html.tmpl
index a8c7d023860a78a7a23d6f76603ec526610c0c5a..984982bd4c7c5fa7ea2df96d9e10cf25a0f59af6 100644 (file)
--- a/client/assets/dev/index.html.tmpl
+++ b/client/assets/dev/index.html.tmpl
@@ -116,7 +116,7 @@
 \r
                             <tr class="channel">\r
                                 <td><label for="server_select_channel">Channel</label></td>\r
-                                <td><input type="text" class="channel" id="server_select_channel"></td>\r
+                                <td><input type="text" class="channel" id="server_select_channel"> <i class="icon-key" title="Channel Key"></i></td>\r
                             </tr>\r
 \r
                             <tr class="have_key">\r

diff --git a/client/assets/dev/view.js b/client/assets/dev/view.js
index b563604f3039341d8cb1324c826e97e0e345121d..8c6325572d7d5219962cbb1557a4c53235c51ab4 100644 (file)
--- a/client/assets/dev/view.js
+++ b/client/assets/dev/view.js
@@ -173,7 +173,8 @@ _kiwi.view.ServerSelect = function () {
             'submit form': 'submitForm',\r
             'click .show_more': 'showMore',\r
             'change .have_pass input': 'showPass',\r
-            'change .have_key input': 'showKey'\r
+            'change .have_key input': 'showKey',\r
+            'click .icon-key': 'channelKeyIconClick'\r
         },\r
 \r
         initialize: function () {\r
@@ -252,6 +253,10 @@ _kiwi.view.ServerSelect = function () {
             }\r
         },\r
 \r
+        channelKeyIconClick: function (event) {\r
+            this.$el.find('tr.have_key input').click();\r
+        },\r
+\r
         showKey: function (event) {\r
             if (this.$el.find('tr.have_key input').is(':checked')) {\r
                 this.$el.find('tr.key').show().find('input').focus();\r