From d4dffab8dff85c72f7f642fccf730a53555eea72 Mon Sep 17 00:00:00 2001
From: Sebastien Hut <sebu77@gmail.com>
Date: Fri, 21 Nov 2014 20:11:23 +0100
Subject: [PATCH] Login form with/without wss input

---
 public/css/otalk.css      | 3 +++
 public/css/pages/aux.styl | 5 ++++-
 public/js/login.js        | 6 ++++--
 views/login.jade          | 6 ++++++
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/public/css/otalk.css b/public/css/otalk.css
index b498762..8ca483e 100644
--- a/public/css/otalk.css
+++ b/public/css/otalk.css
@@ -1559,6 +1559,9 @@ button.secondary:hover:not(:disabled) {
 #loginbox {
   margin-bottom: 120px;
 }
+.fieldContainerWSS {
+  display: none;
+}
 @media screen and (min-width: 768px) {
   .box {
     width: 50%;
diff --git a/public/css/pages/aux.styl b/public/css/pages/aux.styl
index db06714..e7db267 100644
--- a/public/css/pages/aux.styl
+++ b/public/css/pages/aux.styl
@@ -1,6 +1,6 @@
 .aux
   background: lighten($gray-light, 93%)
-  
+
   header
     margin-top: 8%
     text-align: center
@@ -49,6 +49,9 @@
 #loginbox
   margin-bottom: 120px
 
+.fieldContainerWSS
+  display: none
+
 @media screen and (min-width: 768px)
 
   .box
diff --git a/public/js/login.js b/public/js/login.js
index 5f8ef2d..c2e4390 100644
--- a/public/js/login.js
+++ b/public/js/login.js
@@ -1,7 +1,9 @@
 $('#loginbox form').on('submit', function (e) {
-    var jid = $('#jid').val() + "@" + SERVER_CONFIG.domain;
+    var jid = $('#jid').val();
+    if (SERVER_CONFIG.domain && jid.indexOf('@') == -1)
+         jid += "@" + SERVER_CONFIG.domain;
     var password = $('#password').val();
-    var connURL = SERVER_CONFIG.wss;
+    var connURL = SERVER_CONFIG.wss ? SERVER_CONFIG.wss : $('#connURL').val();
 
     var transport;
     var wsURL = '';
diff --git a/views/login.jade b/views/login.jade
index 56e8726..2d752a7 100644
--- a/views/login.jade
+++ b/views/login.jade
@@ -15,9 +15,15 @@ block content
             .fieldContainer
                 label(for='password') Password
                 input(type='password', id='password', name='password', placeholder='•••••••••••••', tabindex='2')
+            .fieldContainer.fieldContainerWSS
+                label(for='wsURL') WebSocket or BOSH URL
+                input(type='text', id='connURL', name='connURL', placeholder='wss://aweso.me:5281/xmpp-websocket', tabindex='3')
 
             button(type='submit', tabindex='3', class="primary") Go!
 
 block scripts
     script(src="/config.js")
     script(src="/js/login.js")
+    script.
+        if ("#{config.wss}".length == 0)
+            $('.fieldContainerWSS').show();