diff options
| author | Imre Farkas <ifarkas@gitlab.com> | 2018-11-12 22:40:42 +0100 |
|---|---|---|
| committer | Imre Farkas <ifarkas@gitlab.com> | 2018-11-18 21:00:28 +0100 |
| commit | 02326fa4b128c6272cc5c802cf5145f0fa6f6cc2 (patch) | |
| tree | a17739647988e8f2c3e414cb9c91d76c09496f6a /app/views/devise/shared/_signin_box.html.haml | |
| parent | 29d8179ba07be3ed111f939285eb4064d84cb7df (diff) | |
| download | gitlab-ce-02326fa4b128c6272cc5c802cf5145f0fa6f6cc2.tar.gz | |
Backport of ee/8120: Smartcard authenticationif-ee-726-smartcard_auth-ce_port
Diffstat (limited to 'app/views/devise/shared/_signin_box.html.haml')
| -rw-r--r-- | app/views/devise/shared/_signin_box.html.haml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/views/devise/shared/_signin_box.html.haml b/app/views/devise/shared/_signin_box.html.haml index 5ddb3ece1cb..ec968e435cd 100644 --- a/app/views/devise/shared/_signin_box.html.haml +++ b/app/views/devise/shared/_signin_box.html.haml @@ -1,10 +1,10 @@ - if form_based_providers.any? - if crowd_enabled? - .login-box.tab-pane.active{ id: "crowd", role: 'tabpanel' } + .login-box.tab-pane{ id: "crowd", role: 'tabpanel', class: active_when(form_based_auth_provider_has_active_class?(:crowd)) } .login-body = render 'devise/sessions/new_crowd' - @ldap_servers.each_with_index do |server, i| - .login-box.tab-pane{ id: "#{server['provider_name']}", role: 'tabpanel', class: active_when(i.zero? && !crowd_enabled?) } + .login-box.tab-pane{ id: "#{server['provider_name']}", role: 'tabpanel', class: active_when(i.zero? && form_based_auth_provider_has_active_class?(:ldapmain)) } .login-body = render 'devise/sessions/new_ldap', server: server - if password_authentication_enabled_for_web? @@ -12,6 +12,8 @@ .login-body = render 'devise/sessions/new_base' + = render_if_exists 'devise/sessions/new_smartcard' + - elsif password_authentication_enabled_for_web? .login-box.tab-pane.active{ id: 'login-pane', role: 'tabpanel' } .login-body |