diff --git a/app/assets/javascripts/validation.js b/app/assets/javascripts/validation.js new file mode 100644 index 0000000..b39a046 --- /dev/null +++ b/app/assets/javascripts/validation.js @@ -0,0 +1,35 @@ +function validation(){ + $("#account_edit").validate({ + rules: { + "user[password]": { + required: false, + minlength: 5 + }, + "user[password_confirmation]": { + required: false, + minlength: 5, + equalTo: "#user_password" + } + }, + messages: { + "user[password]": { + minlength: "Your password must be at least 6 characters long" + }, + "user[password_confirmation]": { + minlength: "Your password must be at least 6 characters long", + equalTo: "Please enter the same password as above" + } + }, + highlight: function(label) { + $("#submit_button").attr('disabled','disabled'); + $(label).closest('.control-group').addClass('error'); + }, + success: function(label) { + label.closest('.control-group').addClass('success'); + $("#submit_button").removeAttr('disabled'); + } + + }); +}; + +$(document).ready(validation()); \ No newline at end of file diff --git a/app/views/layouts/admin/_get_user.html.erb b/app/views/layouts/admin/_get_user.html.erb index d5dfbb2..52b3790 100644 --- a/app/views/layouts/admin/_get_user.html.erb +++ b/app/views/layouts/admin/_get_user.html.erb @@ -56,42 +56,9 @@ <% end %> - diff --git a/app/views/users/account_settings.html.erb b/app/views/users/account_settings.html.erb index b2771dc..2d8fbfa 100644 --- a/app/views/users/account_settings.html.erb +++ b/app/views/users/account_settings.html.erb @@ -51,47 +51,7 @@ - - +<%= javascript_include_tag ('validation.js')%>