From: Darren <darren@Darrens-MacBook-Pro.local>
Date: Tue, 14 May 2013 20:24:41 +0000 (+0100)
Subject: Channel key option in server select dialog changes
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6a296cf0e19ac8abc916f3a57e4a0f180750043a;p=KiwiIRC.git

Channel key option in server select dialog changes
---

diff --git a/client/assets/css/style.css b/client/assets/css/style.css
index 3ccdd63..c2c997b 100644
--- 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 a8c7d02..984982b 100644
--- a/client/assets/dev/index.html.tmpl
+++ b/client/assets/dev/index.html.tmpl
@@ -116,7 +116,7 @@
 
                             <tr class="channel">
                                 <td><label for="server_select_channel">Channel</label></td>
-                                <td><input type="text" class="channel" id="server_select_channel"></td>
+                                <td><input type="text" class="channel" id="server_select_channel"> <i class="icon-key" title="Channel Key"></i></td>
                             </tr>
 
                             <tr class="have_key">
diff --git a/client/assets/dev/view.js b/client/assets/dev/view.js
index b563604..8c63255 100644
--- a/client/assets/dev/view.js
+++ b/client/assets/dev/view.js
@@ -173,7 +173,8 @@ _kiwi.view.ServerSelect = function () {
             'submit form': 'submitForm',
             'click .show_more': 'showMore',
             'change .have_pass input': 'showPass',
-            'change .have_key input': 'showKey'
+            'change .have_key input': 'showKey',
+            'click .icon-key': 'channelKeyIconClick'
         },
 
         initialize: function () {
@@ -252,6 +253,10 @@ _kiwi.view.ServerSelect = function () {
             }
         },
 
+        channelKeyIconClick: function (event) {
+            this.$el.find('tr.have_key input').click();
+        },
+
         showKey: function (event) {
             if (this.$el.find('tr.have_key input').is(':checked')) {
                 this.$el.find('tr.key').show().find('input').focus();