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

[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 895a42eb0bdf49fea6a7ff4b2a4bc5a6151bcd34..f6665cefecae153f74a1e9192ad17031dc21b704 100644 (file)
--- a/app/views/application/_auth_providers.html.erb
+++ b/app/views/application/_auth_providers.html.erb
@@ -2,7 +2,7 @@
 
 <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">
@@ -13,11 +13,12 @@
     <div class="col justify-content-center d-flex align-items-center flex-wrap gap-2">
       <% Auth.providers.each_value do |provider| %>
         <% if provider == "openid" %>
-          <%= button_tag image_tag("openid.svg",
+          <%= 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"),
                          :class => "btn btn-light p-2" %>
         <% elsif provider != @preferred_auth_provider %>
@@ -28,10 +29,10 @@
   <% 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 "openid.svg", :size => "36", :alt => "", :class => "align-text-bottom" %>
+        <%= image_tag "auth_providers/openid.svg", :size => "36", :alt => "", :class => "align-text-bottom" %>
         <%= t ".openid_url" %>
       </label>
       <%= hidden_field_tag("referer", params[:referer], :autocomplete => "off") %>