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

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

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index 3e779a00c9ea8cdc4b36f3a3c96fbeb31d7af2f6..e00a2253f7ded7898bf68fda69437d10c4d8470e 100644 (file)
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -52,33 +52,29 @@ module UserHelper
 
   # External authentication support
 
 
   # External authentication support
 

-  def openid_logo
-    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 = {})
+  def auth_button(provider, options = {})

     link_to(
     link_to(

-      image_tag("#{name}.svg",
-                :alt => t("application.auth_providers.#{name}.alt"),
+      image_tag("auth_providers/#{provider}.svg",
+                :alt => t("application.auth_providers.#{provider}.alt"),

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

-      :class => "auth_button btn btn-light p-2 d-block",
-      :title => t("application.auth_providers.#{name}.title")
+      :class => "auth_button btn btn-outline-secondary border p-2",
+      :title => t("application.auth_providers.#{provider}.title")

     )
   end
 
     )
   end
 

-  def auth_button_preferred(name, provider, options = {})
+  def auth_button_preferred(provider, options = {})

     link_to(
     link_to(

-      image_tag("#{name}.svg",
-                :alt => t("application.auth_providers.#{name}.alt"),
+      image_tag("auth_providers/#{provider}.svg",
+                :alt => t("application.auth_providers.#{provider}.alt"),

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

-                :size => "36") + t("application.auth_providers.#{name}.title"),
+                :size => "36") + t("application.auth_providers.#{provider}.title"),

       auth_path(options.merge(:provider => provider)),
       :method => :post,
       :class => "auth_button btn btn-outline-secondary border py-2 px-4 d-flex justify-content-center align-items-center",
       auth_path(options.merge(:provider => provider)),
       :method => :post,
       :class => "auth_button btn btn-outline-secondary border py-2 px-4 d-flex justify-content-center align-items-center",

-      :title => t("application.auth_providers.#{name}.title")
+      :title => t("application.auth_providers.#{provider}.title")

     )
   end
 
     )
   end