Revert "Merge pull request #9812 from chrspeich/hide-tabs-lone-auth-provider"

This reverts commit 84999611, reversing changes made to 0d9fb211.

Revert "Merge pull request #9812 from chrspeich/hide-tabs-lone-auth-provider"
This reverts commit 84999611, reversing changes made to 0d9fb211.
9337da78 · Robert Speicher · 3777b233 · 9337da78
Commit 9337da78 authored Nov 15, 2015 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 19 additions and 27 deletions

app/views/devise/shared/_signin_box.html.haml app/views/devise/shared/_signin_box.html.haml +19 -27

No files found.
--- a/app/views/devise/shared/_signin_box.html.haml
+++ b/app/views/devise/shared/_signin_box.html.haml
@@ -7,34 +7,26 @@
      %h3 Sign in
  .login-body
    - if form_based_providers.any?
-      - if form_based_providers.count >= 2 || signin_enabled?
+      %ul.nav.nav-tabs
-        %ul.nav.nav-tabs
-          - if crowd_enabled?
-            %li.active
-              = link_to "Crowd", "#tab-crowd", 'data-toggle' => 'tab'
-          - @ldap_servers.each_with_index do |server, i|
-            %li{class: (:active if i.zero? && !crowd_enabled?)}
-              = link_to server['label'], "#tab-#{server['provider_name']}", 'data-toggle' => 'tab'
-          - if signin_enabled?
-            %li
-              = link_to 'Standard', '#tab-signin', 'data-toggle' => 'tab'
-        .tab-content
-          - if crowd_enabled?
-            %div.tab-pane.active{id: "tab-crowd"}
-              = render 'devise/sessions/new_crowd'
-          - @ldap_servers.each_with_index do |server, i|
-            %div.tab-pane{id: "tab-#{server['provider_name']}", class: (:active if i.zero? && !crowd_enabled?)}
-              = render 'devise/sessions/new_ldap', server: server
-          - if signin_enabled?
-            %div#tab-signin.tab-pane
-              = render 'devise/sessions/new_base'
-      - else
        - if crowd_enabled?
-          = render 'devise/sessions/new_crowd'
+          %li.active
-        - elsif @ldap_servers.any?
+            = link_to "Crowd", "#tab-crowd", 'data-toggle' => 'tab'
-          = render 'devise/sessions/new_ldap', server: @ldap_servers.first
+        - @ldap_servers.each_with_index do |server, i|
-        - elsif signin_enabled?
+          %li{class: (:active if i.zero? && !crowd_enabled?)}
-          = render 'devise/sessions/new_base'
+            = link_to server['label'], "#tab-#{server['provider_name']}", 'data-toggle' => 'tab'
+        - if signin_enabled?
+          %li
+            = link_to 'Standard', '#tab-signin', 'data-toggle' => 'tab'
+      .tab-content
+        - if crowd_enabled?
+          %div.tab-pane.active{id: "tab-crowd"}
+            = render 'devise/sessions/new_crowd'
+        - @ldap_servers.each_with_index do |server, i|
+          %div.tab-pane{id: "tab-#{server['provider_name']}", class: (:active if i.zero? && !crowd_enabled?)}
+            = render 'devise/sessions/new_ldap', server: server
+        - if signin_enabled?
+          %div#tab-signin.tab-pane
+            = render 'devise/sessions/new_base'
    - elsif signin_enabled?
      = render 'devise/sessions/new_base'