upgrade: simple_form to bootstrap 3

* reran the simple form initializer.
* wrapped submit buttons are now broken and need a fix.
* disabled confirmation validation in client side validations as the
  error message always is attached to the wrong field.

2 files changed, 26 insertions, 5 deletions

diff --git a/app/assets/javascripts/users.js b/app/assets/javascripts/users.js
index 59478a6..9a10532 100644
--- a/app/assets/javascripts/users.js
+++ b/app/assets/javascripts/users.js
@@ -10,6 +10,7 @@
       poll_identities,
       prevent_default,
       clear_errors,
+      validate_password_confirmation,
       signup,
       update_user;
 
@@ -57,6 +58,20 @@
     });
   };
 
+  validate_password_confirmation = function(submitEvent) {
+    var form = submitEvent.target;
+    var password = $(form).find('input#srp_password').val();
+    var confirmation = $(form).find('input#srp_password_confirmation').val();
+    if (password === confirmation) {
+      return true;
+    }
+    else {
+      displayFieldError("password_confirmation", "does not match.");
+      submitEvent.stopImmediatePropagation()
+      return false;
+    }
+  };
+
   var account = {
 
     // Returns the user's identity
@@ -163,6 +178,7 @@
     $('.hidden.js-show').removeClass('hidden');
     $('.js-show').show();
     $('#new_user').submit(prevent_default);
+    $('#new_user').submit(validate_password_confirmation);
     $('#new_user').submit(signup);
     $('#new_session').submit(prevent_default);
     $('#new_session').submit(srp.login);
diff --git a/app/views/account/new.html.haml b/app/views/account/new.html.haml
index d40259e..4766945 100644
--- a/app/views/account/new.html.haml
+++ b/app/views/account/new.html.haml
@@ -6,7 +6,12 @@
 -# to prevent submission in the clear.
 -#
 
-- form_options = {url: '/not-used', html: {id: 'new_user', class: user_form_class('form-horizontal'), style: 'display:none'}, validate: true}
+- form_options = { url: '/not-used',
+  html: { id: 'new_user',
+    class: user_form_class('form-horizontal'),
+    style: 'display:none' },
+  validate: true,
+  wrapper: :horizontal_form }
 
 .col-md-1
 .col-md-9
@@ -14,14 +19,14 @@
   .lead=t :signup_info
   = render "sessions/warnings"
   = simple_form_for(@user, form_options) do |f|
-    = f.input :login, :label => t(:username), :required => false, :input_html => { :id => :srp_username }
-    = f.input :password, :label => t(:password), :required => false, :validate => true, :input_html => { :id => :srp_password }
-    = f.input :password_confirmation, :label => t(:password_confirmation), :required => false, :validate => true, :input_html => { :id => :srp_password_confirmation }
+    = f.input :login, :label => t(:username), :validate => true, :input_html => { :id => :srp_username}
+    = f.input :password, :label => t(:password), :validate => true, :input_html => { :id => :srp_password }
+    = f.input :password_confirmation, :label => t(:password_confirmation), :validate => true, :input_html => { :id => :srp_password_confirmation }
 
     - if APP_CONFIG[:invite_required]
       = f.input :invite_code, :label => t(:invite_code), :input_html => { :id => :srp_invite_code }
     - else
       = f.input :invite_code, :as => "hidden", :input_html => { :value => " ", :id => :srp_invite_code }
 
-    = f.button :wrapped, cancel: home_path
+    = f.button :submit # :wrapped, cancel: home_path
 -#