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

diff --combined app/views/application/_auth_providers.html.erb
index 1455a46c54609b8ad1126e1ca9e128b06bddd274,17c1fa648ad7c18d08cb636265f499a91322d853..bdd0c474a932afd2eb42b20bb8d96a90d23b1e18
--- 1/app/views/application/_auth_providers.html.erb
--- 2/app/views/application/_auth_providers.html.erb
+++ b/app/views/application/_auth_providers.html.erb
@@@ -25,13 -25,13 +25,13 @@@
        <div class="justify-content-center d-flex align-items-center flex-wrap gap-2">
      <% end %>
  
-       <%= link_to image_tag("openid.svg",
-                             :alt => t("application.auth_providers.openid.alt"),
-                             :size => "36"),
-                   "#",
-                   :id => "openid_open_url",
-                   :title => t("application.auth_providers.openid.title"),
-                   :class => "btn btn-light p-2" %>
+       <%= button_tag image_tag("openid.svg",
+                                :alt => t(".openid.alt"),
+                                :size => "36"),
+                      :type => "button",
+                      :id => "openid_open_url",
+                      :title => t(".openid.title"),
+                      :class => "btn btn-light p-2" %>
  
        <% %w[google facebook microsoft github wikipedia].each do |provider| %>
          <% unless @preferred_auth_provider == provider %>
@@@ -46,10 -46,7 +46,10 @@@
    <%# :tabindex starts high to allow rendering at the bottom of the template %>
    <%= form_tag(auth_path(:provider => "openid"), :id => "openid_login_form") do %>
      <div id="login_openid_url" class="mb-3">
 -      <label for="openid_url" class="form-label"><%= t ".openid_html", :logo => openid_logo %></label>
 +      <label for="openid_url" class="form-label">
 +        <%= image_tag "openid.svg", :size => "36", :alt => "", :class => "align-text-bottom" %>
 +        <%= t ".openid_url" %>
 +      </label>
        <%= hidden_field_tag("referer", params[:referer], :autocomplete => "off") %>
        <%= text_field_tag("openid_url", "", :tabindex => 20, :autocomplete => "on", :class => "form-control") %>
        <span class="form-text text-body-secondary">(<a href="<%= t "accounts.edit.openid.link" %>" target="_new"><%= t "accounts.edit.openid.link text" %></a>)</span>