added a button to login with account in the modal login dialog

diff --git a/config.json b/config.json
index 107551eb4143a5e636578c3d7c71df70c4ece5af..e3a903e08a971c03bc4389ec6e582c92f9800b87 100644 (file)
--- a/config.json
+++ b/config.json
@@ -6,7 +6,7 @@
     "pop",
     "rock",
     "rap",
-    "80s",
+    "oldies",
     "mixed"
   ],
   "songsinarun": 15

diff --git a/package.json b/package.json
index 219683ff44b5b2bef7dfd0538b38632286cbef04..59377954c50dcb5e2ed54ea8fb18f661352308e9 100644 (file)
--- a/package.json
+++ b/package.json
@@ -21,5 +21,5 @@
     "start": "app.js"
   },
   "subdomain": "binb",
-  "version": "0.3.3-14"
+  "version": "0.3.3-16"
 }
\ No newline at end of file

diff --git a/public/static/css/style.css b/public/static/css/style.css
index a5e19515e109ddf5829be8b80e2a6dcf31bc4aba..5161608d815322e676a3ff3cc15e1d844e0046d6 100644 (file)
--- a/public/static/css/style.css
+++ b/public/static/css/style.css
@@ -43,6 +43,9 @@ h6 {
     color: #999999;
     text-transform: uppercase;
 }
+.align-left {
+    text-align: left;
+}
 .navbar .brand {
     padding: 2px 20px 4px;
 }
@@ -114,13 +117,31 @@ form .clearfix {
     -moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);
     box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);
 }
-#message, #guess {
+#login, #guess, #message {
     margin-bottom: 0;
 }
-.modal-footer {
-    text-align: left;
+#login {
+    float: left;
+}
+#join {
+    margin-right: 45px;
+}
+.modal-footer .divider, .modal-footer .divider span {
+    position: absolute;
+}
+.modal-footer .divider {
+    border-left: 1px solid #ddd;
+    height: 38px;
+    top: 9px;
+    left: 442px;
+}
+.modal-footer .divider span {
+    color: #aaa;
+    background-color: #F5F5F5;
+    top: 10px;
+    left: -6px;
 }
-.modal-footer .btn, .users-counter, #total-tracks, #tracks a, #nodejitsu-logo, .footer-info {
+.users-counter, #total-tracks, #tracks a, #nodejitsu-logo, .footer-info {
     float: right;
 }
 .thumbnails {

diff --git a/public/static/js/room.js b/public/static/js/room.js
index 396e24f28c77214c572d1f06adce6b4206db9011..1c43d1d7e37bd343d0fb4f0b87af86bd04b01e1e 100644 (file)
--- a/public/static/js/room.js
+++ b/public/static/js/room.js
@@ -407,7 +407,8 @@
         }
 
         html +='</tbody></table></div>';
-        html += '<div class="modal-footer">A new game will start in <span></span> second/s</div>';
+        html += '<div class="modal-footer align-left">A new game will start in ';
+        html += '<span></span> second/s</div>';
         DOM.modal.append($(html));
         DOM.modal.modal('show');
         countDown(Date.now()+10000);
@@ -451,10 +452,13 @@
                 var html = '<div class="modal-header">';
                 html += '<h3>You are joining the '+roomname+' room</h3></div>';
                 html += '<div class="modal-body"><p>'+(msg || "What's your name?")+'</p></div>';
-                html += '<div class="modal-footer">';
+                html += '<div class="modal-footer relative">';
                 html += '<input id="login" class="" type="text" name="nickname" />';
-                html += '<button id="join" class="btn btn-primary">';
-                html += '<i class="icon-user icon-white"></i> Join the game</button></div>';
+                html += '<button id="join" class="btn btn-success">';
+                html += '<i class="icon-user icon-white"></i> Join the game</button>';
+                html += '<span class="divider"><span>or</span></span>';
+                html += '<a class="btn btn-primary" href="/login?followup=/'+roomname+'">';
+                html += '<i class="icon-lock icon-white"></i> Login</a></div>';
 
                 $(html).appendTo(DOM.modal);
                 var login = $('#login');

diff --git a/views/header.jade b/views/header.jade
index 56d25b249263549a89b86e019e5e8c3ba2079d8a..75762e37f5ba1784eca56e0abde37b96adf3a321 100644 (file)
--- a/views/header.jade
+++ b/views/header.jade
@@ -7,7 +7,7 @@ head
     meta(name="keywords", content="iTunes, music, quiz, binb, beatquest, realtime, multiplayer, listening, game")
     meta(name="description", content="Simple, realtime, multiplayer, competitive music listening game. Guess the song and prove your music knowledge!")
     meta(name="author", content="Luigi Pinca")
-    script(src="//ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js")
+    script(src="//ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js")
     script
         var _gaq = _gaq || [];
         _gaq.push(['_setAccount', 'UA-29865853-1']);