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

[rails.git] / app / helpers / user_helper.rb

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index d0b2f0be550a47874e150eef4be3c1cb94d722e5..cc7d7aeca08646175fdde971c821c6a6a3bf3926 100644 (file)
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -53,18 +53,31 @@ module UserHelper
   # External authentication support
 
   def openid_logo
   # External authentication support
 
   def openid_logo

-    image_tag "openid_small.png", :alt => t("application.auth_providers.openid_logo_alt"), :class => "align-text-bottom"
+    image_tag "openid.svg", :size => "36", :alt => t("application.auth_providers.openid_logo_alt"), :class => "align-text-bottom"

   end
 
   def auth_button(name, provider, options = {})
     link_to(
       image_tag("#{name}.svg",
                 :alt => t("application.auth_providers.#{name}.alt"),
   end
 
   def auth_button(name, provider, options = {})
     link_to(
       image_tag("#{name}.svg",
                 :alt => t("application.auth_providers.#{name}.alt"),

-                :class => "rounded-3",
+                :class => "rounded-1",

                 :size => "36"),
       auth_path(options.merge(:provider => provider)),
       :method => :post,
                 :size => "36"),
       auth_path(options.merge(:provider => provider)),
       :method => :post,

-      :class => "auth_button",
+      :class => "auth_button btn btn-light p-2 d-block",
+      :title => t("application.auth_providers.#{name}.title")
+    )
+  end
+
+  def auth_button_preferred(name, provider, options = {})
+    link_to(
+      image_tag("#{name}.svg",
+                :alt => t("application.auth_providers.#{name}.alt"),
+                :class => "rounded-1 me-3",
+                :size => "36") + t("application.auth_providers.#{name}.title"),
+      auth_path(options.merge(:provider => provider)),
+      :method => :post,
+      :class => "auth_button btn btn-outline-secondary fs-6 border rounded py-2 px-4 d-flex justify-content-center align-items-center",

       :title => t("application.auth_providers.#{name}.title")
     )
   end
       :title => t("application.auth_providers.#{name}.title")
     )
   end