Commit 3806c008 authored by Phil Hughes's avatar Phil Hughes

Password settings page

Closes #13858
parent 1fe9b933
...@@ -5,12 +5,6 @@ ...@@ -5,12 +5,6 @@
} }
} }
.profile-settings-sidebar {
a {
color: $profile-settings-link-color;
}
}
.avatar-image { .avatar-image {
@media (min-width: $screen-sm-min) { @media (min-width: $screen-sm-min) {
float: left; float: left;
...@@ -24,6 +18,11 @@ ...@@ -24,6 +18,11 @@
display: inline-block; display: inline-block;
} }
.account-btn-link,
.profile-settings-sidebar a {
color: $profile-settings-link-color;
}
.oauth-buttons { .oauth-buttons {
.btn-group { .btn-group {
margin-right: 10px; margin-right: 10px;
......
- page_title "Password" - page_title "Password"
- header_title page_title, edit_profile_password_path - header_title page_title, edit_profile_password_path
.alert.alert-help.prepend-top-default .row.prepend-top-default
- if @user.password_automatically_set? .col-lg-3.profile-settings-sidebar
Set your password. %h4.prepend-top-0
- else = page_title
Change your password or recover your current one. %p
.update-password.prepend-top-default
= form_for @user, url: profile_password_path, method: :put, html: { class: 'form-horizontal' } do |f|
%div
%p.slead
- unless @user.password_automatically_set?
You must provide current password in order to change it.
%br
After a successful password update, you will be redirected to the login page where you can log in with your new password. After a successful password update, you will be redirected to the login page where you can log in with your new password.
.col-lg-9
%p
Change your password
- unless @user.password_automatically_set?
or recover your current one
= form_for @user, url: profile_password_path, method: :put do |f|
-if @user.errors.any? -if @user.errors.any?
.alert.alert-danger .alert.alert-danger
%ul %ul
...@@ -22,19 +20,16 @@ ...@@ -22,19 +20,16 @@
%li= msg %li= msg
- unless @user.password_automatically_set? - unless @user.password_automatically_set?
.form-group .form-group
= f.label :current_password, class: 'control-label' = f.label :current_password, class: 'label-light'
.col-sm-10
= f.password_field :current_password, required: true, class: 'form-control' = f.password_field :current_password, required: true, class: 'form-control'
%div %p.help-block
= link_to "Forgot your password?", reset_profile_password_path, method: :put You must provide your current password in order to change it.
.form-group .form-group
= f.label :password, 'New password', class: 'control-label' = f.label :password, 'New password', class: 'label-light'
.col-sm-10
= f.password_field :password, required: true, class: 'form-control' = f.password_field :password, required: true, class: 'form-control'
.form-group .form-group
= f.label :password_confirmation, class: 'control-label' = f.label :password_confirmation, class: 'label-light'
.col-sm-10
= f.password_field :password_confirmation, required: true, class: 'form-control' = f.password_field :password_confirmation, required: true, class: 'form-control'
.form-actions .prepend-top-default.append-bottom-default
= f.submit 'Save password', class: "btn btn-create" = f.submit 'Save password', class: "btn btn-create append-right-10"
= link_to "I forgot my password", reset_profile_password_path, method: :put, class: "account-btn-link"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment