From: Tom Hughes <tom@compton.nu>
Date: Sat, 20 Jul 2024 11:03:43 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/5007'
X-Git-Tag: live~764
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/c0cf556c050719484b1fd1343b5f3bae29acc7bf?ds=inline;hp=-c

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

c0cf556c050719484b1fd1343b5f3bae29acc7bf
diff --combined app/views/application/_auth_providers.html.erb
index b7fb5ba4d,487256cb0..f6665cefe
--- a/app/views/application/_auth_providers.html.erb
+++ b/app/views/application/_auth_providers.html.erb
@@@ -2,7 -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,12 -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 %>
@@@ -29,10 -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") %>