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

diff --git a/app/assets/javascripts/auth_providers.js b/app/assets/javascripts/auth_providers.js
index 975c57a9b611a87738dc51d0c2da09bac91d9ff5..3dd7601a088686c124f3b3ef170028b5ba099351 100644 (file)
--- a/app/assets/javascripts/auth_providers.js
+++ b/app/assets/javascripts/auth_providers.js
@@ -9,8 +9,7 @@ $(document).ready(function () {
   });
 
   // Add click handler to show OpenID field
-  $("#openid_open_url").click(function (e) {
-    e.preventDefault();
+  $("#openid_open_url").click(function () {
     $("#openid_url").val("http://");
     $("#login_auth_buttons").hide().removeClass("d-flex");
     $("#login_openid_url").show();

diff --git a/app/views/application/_auth_providers.html.erb b/app/views/application/_auth_providers.html.erb
index 1455a46c54609b8ad1126e1ca9e128b06bddd274..bdd0c474a932afd2eb42b20bb8d96a90d23b1e18 100644 (file)
--- a/app/views/application/_auth_providers.html.erb
+++ b/app/views/application/_auth_providers.html.erb
@@ -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 %>