Confirm password

2 files changed, 19 insertions, 7 deletions

diff --git a/public/css/calculator.less b/public/css/calculator.less
index be8a7e7d..2b7ffc92 100644
--- a/public/css/calculator.less
+++ b/public/css/calculator.less
@@ -17,15 +17,14 @@ div.container-fluid {
 
 .form-group {
   .form-control { height: 40px; padding: 3px; }
-  label { font-weight: normal; display: block; }
-  p, span, input[type="text"], select, label { font-size: 20px; }
+  label { font-weight: normal; font-size: 14px; display: block; }
+  p, span, input[type="text"], select { font-size: 18px; }
   span, label { color: #999; }
   .form-control { display: inline-block; }
 }
 
 form#setup, form#register {
-  .form-control { width: 300px; }
-  #address { font-size: 12px; }
+  .form-control { width: 400px; }
 }
 
 
@@ -39,7 +38,6 @@ div#calculator {
 }
 
 td#total { font-weight: bold; text-align: right; }
-small { color: #999; }
 div#calculator p#address { font-size: 1em; margin-top: 20px; }
 
 
diff --git a/public/js/setup.coffee b/public/js/setup.coffee
index dcb58bcb..e8b4e09b 100644
--- a/public/js/setup.coffee
+++ b/public/js/setup.coffee
@@ -4,19 +4,20 @@
 #= require jsbn2.js
 #= require check_address.js
 
+g = exports ? this
+g.proceed = false
+
 $(->
   $.getJSON("/js/rates.json", (data) ->
     currencies = Object.keys(data)
     currencies = currencies.sort()
     currencies.pop()
 
-  
     $.each(currencies, (i, v) ->
       $('#currency').append("<option value='#{v}'>#{v}</option>")
     )
     $("#currency option[value='CAD']").attr('selected', 'selected')
 
-
     user = $('#username').val()
 
     $('#currency').change(->
@@ -41,6 +42,19 @@ $(->
         $(this).css('color', 'red')
     )
 
+    $('#confirm').blur(->
+      $('#confirm_error').remove() 
+      if $('#password').val() != $('#confirm').val()
+        $('#password, #confirm').parent().addClass('has-error')
+        $('#confirm').parent().after('<div id="confirm_error" class="alert alert-danger">Passwords don\'t match</div>')
+      else
+        $('#password, #confirm').parent().removeClass('has-error')
+    )
+
+    $('#setup').submit(->
+      return false if $('.has-error').length()
+    )
+
     if user
       $('#setup').attr('action', "/#{user}/update").attr('method', 'post')
       $.getJSON("/#{user}.json", (data) ->