Merge remote-tracking branch 'upstream/pull/5461'

[rails.git] / app / views / application / _auth_providers.html.erb

diff --git a/app/views/application/_auth_providers.html.erb b/app/views/application/_auth_providers.html.erb
index 487256cb0724feebc02f57b7a06c9419cf7bc961..3edc6edd2476d9a8fd195867f7d01b832c7f29eb 100644 (file)
--- a/app/views/application/_auth_providers.html.erb
+++ b/app/views/application/_auth_providers.html.erb
@@ -1,8 +1,8 @@
-<% prefered_auth_button_available = @preferred_auth_provider != "openid" && Auth.providers.value?(@preferred_auth_provider) %>
+<% prefered_auth_button_available = @preferred_auth_provider != "openid" && Auth.providers.include?(@preferred_auth_provider) %>

 
 <div>
   <%= tag.div :id => "login_auth_buttons",
 
 <div>
   <%= tag.div :id => "login_auth_buttons",

-              :class => ["row row-cols-1", { "row-cols-sm-2" => prefered_auth_button_available }, "g-2 mb-3"] do %>
+              :class => ["collapse show row row-cols-1", { "row-cols-sm-2" => prefered_auth_button_available }, "g-2 mb-3"] do %>

 
     <% if prefered_auth_button_available %>
       <div class="col justify-content-center d-flex align-items-center flex-wrap">
 
     <% if prefered_auth_button_available %>
       <div class="col justify-content-center d-flex align-items-center flex-wrap">


@@ -11,15 +11,16 @@
     <% end %>
 
     <div class="col justify-content-center d-flex align-items-center flex-wrap gap-2">
     <% end %>
 
     <div class="col justify-content-center d-flex align-items-center flex-wrap gap-2">

-      <% Auth.providers.each_value do |provider| %>
+      <% Auth.providers.each do |provider| %>

         <% if provider == "openid" %>
           <%= button_tag image_tag("auth_providers/openid.svg",
                                    :alt => t(".openid.alt"),
                                    :size => "36"),
                          :type => "button",
         <% if provider == "openid" %>
           <%= button_tag image_tag("auth_providers/openid.svg",
                                    :alt => t(".openid.alt"),
                                    :size => "36"),
                          :type => "button",

-                         :id => "openid_open_url",
+                         :data => { "bs-toggle" => "collapse",
+                                    "bs-target" => "#login_auth_buttons, #openid_login_form" },

                          :title => t(".openid.title"),
                          :title => t(".openid.title"),

-                         :class => "btn btn-light p-2" %>
+                         :class => "btn btn-outline-secondary border p-2" %>

         <% elsif provider != @preferred_auth_provider %>
           <%= auth_button provider %>
         <% end -%>
         <% elsif provider != @preferred_auth_provider %>
           <%= auth_button provider %>
         <% end -%>


@@ -28,7 +29,7 @@
   <% end %>
 
   <%# :tabindex starts high to allow rendering at the bottom of the template %>
   <% end %>
 
   <%# :tabindex starts high to allow rendering at the bottom of the template %>

-  <%= form_tag(auth_path(:provider => "openid"), :id => "openid_login_form") do %>
+  <%= form_tag auth_path(:provider => "openid"), :id => "openid_login_form", :class => "collapse" do %>

     <div class="mb-3">
       <label for="openid_url" class="form-label">
         <%= image_tag "auth_providers/openid.svg", :size => "36", :alt => "", :class => "align-text-bottom" %>
     <div class="mb-3">
       <label for="openid_url" class="form-label">
         <%= image_tag "auth_providers/openid.svg", :size => "36", :alt => "", :class => "align-text-bottom" %>