diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-09-18 16:37:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-18 16:37:27 +0200 |
| commit | e1066cd4319a220d5be16e51ffaf5236a2f6e866 (patch) | |
| tree | 3cac387721ffb3cefa66d96d1867ae88c9e249ce /app/views/auth | |
| parent | d0c2c5278391b82ba7fa2f230bf237805ff61a0c (diff) | |
Add password challenge to 2FA settings, e-mail notifications (#11878)
Fix #3961
Diffstat (limited to 'app/views/auth')
| -rw-r--r-- | app/views/auth/challenges/new.html.haml | 15 | ||||
| -rw-r--r-- | app/views/auth/shared/_links.html.haml | 2 |
2 files changed, 16 insertions, 1 deletions
diff --git a/app/views/auth/challenges/new.html.haml b/app/views/auth/challenges/new.html.haml new file mode 100644 index 000000000..9aef2c35d --- /dev/null +++ b/app/views/auth/challenges/new.html.haml @@ -0,0 +1,15 @@ +- content_for :page_title do + = t('challenge.prompt') + += simple_form_for @challenge, url: request.get? ? auth_challenge_path : '' do |f| + = f.input :return_to, as: :hidden + + .field-group + = f.input :current_password, wrapper: :with_block_label, input_html: { :autocomplete => 'off', :autofocus => true }, label: t('challenge.prompt'), required: true + + .actions + = f.button :button, t('challenge.confirm'), type: :submit + + %p.hint.subtle-hint= t('challenge.hint_html') + +.form-footer= render 'auth/shared/links' diff --git a/app/views/auth/shared/_links.html.haml b/app/views/auth/shared/_links.html.haml index e6c3f7cca..66ed5b93f 100644 --- a/app/views/auth/shared/_links.html.haml +++ b/app/views/auth/shared/_links.html.haml @@ -11,7 +11,7 @@ - if controller_name != 'passwords' && controller_name != 'registrations' %li= link_to t('auth.forgot_password'), new_user_password_path - - if controller_name != 'confirmations' + - if controller_name != 'confirmations' && (!user_signed_in? || !current_user.confirmed? || current_user.unconfirmed_email.present?) %li= link_to t('auth.didnt_get_confirmation'), new_user_confirmation_path - if user_signed_in? && controller_name != 'setup' |