diff options
| author | Jacopo <beschi.jacopo@gmail.com> | 2018-01-02 01:43:16 +0300 |
|---|---|---|
| committer | Jacopo <beschi.jacopo@gmail.com> | 2018-01-18 16:32:44 +0300 |
| commit | 269594bf2277e14d8cd189cdbbeeee7db8ed23d7 (patch) | |
| tree | be62b90e2beee0166a1af52e754aefd1131430b7 /app/views/devise | |
| parent | 50a649530a53a04d2044f9e4c5502586a7ed0c59 (diff) | |
Fix Shows signin tab after new user email confirmation
When a new user confirm his email the signin tab is correctly shown.
Diffstat (limited to 'app/views/devise')
| -rw-r--r-- | app/views/devise/shared/_signin_box.html.haml | 2 | ||||
| -rw-r--r-- | app/views/devise/shared/_tabs_ldap.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/devise/shared/_signin_box.html.haml b/app/views/devise/shared/_signin_box.html.haml index 6087f4a0b37..5ddb3ece1cb 100644 --- a/app/views/devise/shared/_signin_box.html.haml +++ b/app/views/devise/shared/_signin_box.html.haml @@ -8,7 +8,7 @@ .login-body = render 'devise/sessions/new_ldap', server: server - if password_authentication_enabled_for_web? - .login-box.tab-pane{ id: 'ldap-standard', role: 'tabpanel' } + .login-box.tab-pane{ id: 'login-pane', role: 'tabpanel' } .login-body = render 'devise/sessions/new_base' diff --git a/app/views/devise/shared/_tabs_ldap.html.haml b/app/views/devise/shared/_tabs_ldap.html.haml index 94f19ccd44c..270191f9452 100644 --- a/app/views/devise/shared/_tabs_ldap.html.haml +++ b/app/views/devise/shared/_tabs_ldap.html.haml @@ -7,7 +7,7 @@ = link_to server['label'], "##{server['provider_name']}", 'data-toggle' => 'tab' - if password_authentication_enabled_for_web? %li - = link_to 'Standard', '#ldap-standard', 'data-toggle' => 'tab' + = link_to 'Standard', '#login-pane', 'data-toggle' => 'tab' - if allow_signup? %li = link_to 'Register', '#register-pane', 'data-toggle' => 'tab' |