SSL selection fix, CSS mods on login screen

diff --git a/css/ui.css b/css/ui.css
index bbecaa779c1d5836e88e2d85f3dd1e7ced696e4a..c13d5724a745a4b47a68c5912dd746432e4fa578 100644 (file)
--- a/css/ui.css
+++ b/css/ui.css
@@ -33,12 +33,14 @@
 #kiwi #login { width:665px; margin:0px auto; }\r
 #kiwi #login ul { list-style:none; }\r
 #kiwi #login ul li { overflow:show; margin-bottom:10px; }\r
+#kiwi #login ul li.section { margin-top:25px; }\r
 #kiwi #login ul li label { float:left; text-align:right; padding-right:.5em; }\r
 #kiwi #login input {\r
        border:none;\r
        box-shadow: inset 0 1px 2px rgba(0,0,0,0.5),0 1px 0px rgba(255,255,255,0.3);\r
 \r
 }\r
+#kiwi #login input[type=checkbox] { width:auto !important; }\r
 #kiwi #login .more { border-top: 1px dotted #888888; }\r
 #kiwi #login .more_link {\r
        font-size:12px;\r

diff --git a/js/front.js b/js/front.js
index d7ed40626b9f79460b56065dee128ab64453d4f6..8a4c7ad096e79a65aa990bce2cc191fd53d06871 100644 (file)
--- a/js/front.js
+++ b/js/front.js
@@ -122,7 +122,9 @@ kiwi.front = {
             kiwi.front.doLayout();
             try {
                 kiwi.front.run('/connect ' + netsel.val() + ' ' + netport.val() + ' ' + (netssl.attr('checked') ? 'true' : ''));
-            } catch (e) {}
+            } catch (e) {
+                console.log(e);
+            }
             
             $('#kiwi .connectwindow').slideUp('', kiwi.front.barsShow);
             $('#windows').click(function () { $('#kiwi_msginput').focus(); });
@@ -283,22 +285,22 @@ kiwi.front = {
                 
             case '/connect':
             case '/server':
-                if (parts[1] === undefined) {
-                    alert('Usage: /connect servername [[port] [ssl]]');
+                if (typeof parts[1] === 'undefined') {
+                    alert('Usage: /connect servername [port] [ssl]');
                     break;
                 }
                 
-                if (parts[2] === undefined) {
+                if (typeof parts[2] === 'undefined') {
                     parts[2] = 6667;
                 }
                 
-                if ((parts[3] === undefined) || (parts[3] === 'false') || (parts[3] === 'no')) {
+                if ((typeof parts[3] === 'undefined') || !parts[3] || (parts[3] === 'false') || (parts[3] === 'no')) {
                     parts[3] = false;
                 } else {
                     parts[3] = true;
                 }
                 
-                kiwi.front.cur_channel.addMsg(null, ' ', '=== Connecting to ' + parts[1] + ' on port ' + parts[2] + ((parts[3]) ? ' using SSL' : '') + '...', 'status');
+                kiwi.front.cur_channel.addMsg(null, ' ', '=== Connecting to ' + parts[1] + ' on port ' + parts[2] + (parts[3] ? ' using SSL' : '') + '...', 'status');
                 kiwi.gateway.connect(parts[1], parts[2], parts[3]);
                 break;
                 

diff --git a/node/client/index.html.jade b/node/client/index.html.jade
index 9c8993ab0184bb09890b6d1342cd4ff269de7e5e..2c66c67f12d3021aa23efb837218634f75fd43f9 100644 (file)
--- a/node/client/index.html.jade
+++ b/node/client/index.html.jade
@@ -144,7 +144,7 @@ html(xmlns="http://www.w3.org/1999/xhtml", lang="en-gb")
                                     li
                                         label(for="channel") Channel:
                                         input(type="text", id="channel", name="channel", class="channel", value="#kiwiirc")
-                                    li
+                                    li(class="section")
                                         label(for="port") Port:
                                         input(type="text", id="port", name="port", class="port", value="6667")
                                     li