diff options
| author | jessib <jessib@leap.se> | 2013-02-26 13:25:25 -0800 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2013-02-26 13:25:25 -0800 |
| commit | c97f356ae8ce07dab04b81d0d0160f3e5fd96f6d (patch) | |
| tree | 73e5d68347d5aa839b3b63eaf3eefcc49e4d937d | |
| parent | a7722e57ee6e10b578457e880f04349f7f9a0f66 (diff) | |
| parent | 97fe2b4d19edacf2ea67c7efcfbec50feca305b0 (diff) | |
Merge branch 'master' into feature/limit_usernames
| -rw-r--r-- | users/app/assets/javascripts/users.js.coffee | 4 | ||||
| -rw-r--r-- | users/app/views/users/edit.html.haml | 2 | ||||
| -rw-r--r-- | users/config/locales/en.yml | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/users/app/assets/javascripts/users.js.coffee b/users/app/assets/javascripts/users.js.coffee index a62be6d..955556c 100644 --- a/users/app/assets/javascripts/users.js.coffee +++ b/users/app/assets/javascripts/users.js.coffee @@ -37,8 +37,8 @@ $(document).ready -> $('#new_user').submit srp.signup $('#new_session').submit preventDefault $('#new_session').submit srp.login - $('.user.form.change_login_and_password').submit srp.update - $('.user.form.change_login_and_password').submit preventDefault + $('.user.form.update_login_and_password').submit srp.update + $('.user.form.update_login_and_password').submit preventDefault $('.user.typeahead').typeahead({source: pollUsers}); $('a[data-toggle="tab"]').on('shown', -> $(ClientSideValidations.selectors.forms).validate() diff --git a/users/app/views/users/edit.html.haml b/users/app/views/users/edit.html.haml index 4de72f6..97bd48d 100644 --- a/users/app/views/users/edit.html.haml +++ b/users/app/views/users/edit.html.haml @@ -2,7 +2,7 @@ %h2=t :settings - tabs = [] - content_for :account do - = user_form_with 'login_and_password_fields', :legend => :change_login_and_password if @user == current_user + = user_form_with 'login_and_password_fields', :legend => :update_login_and_password if @user == current_user = render 'cancel_account' - tabs << :account - if @user == current_user diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml index bda38fe..1b2789e 100644 --- a/users/config/locales/en.yml +++ b/users/config/locales/en.yml @@ -7,9 +7,7 @@ en: login_message: "Please login with your account." wrong_password: "wrong password" user_not_found: "could not be found" - change_login: "Change Login" - change_login_and_password: "Change Login and Password" - change_password: "Change Password" + update_login_and_password: "Update Login and Password" cancel_account: "Cancel your account" remove_account: "Remove Account" admin_cancel_account: "Cancel the account %{username}" |