Remove single-use OpenID logo helper

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

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index 6884fba4dce2b71207c31c85a674c7e92600ecde..734a266db0bcaee9e9061f4d0ce2f4454d04a37b 100644 (file)
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -2,7 +2,7 @@ module UserHelper
   # User images
 
   def user_image(user, options = {})
   # User images
 
   def user_image(user, options = {})

-    options[:class] ||= "user_image border border-secondary-subtle"
+    options[:class] ||= "user_image border border-secondary-subtle bg-body"

     options[:alt] ||= ""
 
     if user.image_use_gravatar
     options[:alt] ||= ""
 
     if user.image_use_gravatar


@@ -15,7 +15,7 @@ module UserHelper
   end
 
   def user_thumbnail(user, options = {})
   end
 
   def user_thumbnail(user, options = {})

-    options[:class] ||= "user_thumbnail border border-secondary-subtle"
+    options[:class] ||= "user_thumbnail border border-secondary-subtle bg-body"

     options[:alt] ||= ""
 
     if user.image_use_gravatar
     options[:alt] ||= ""
 
     if user.image_use_gravatar


@@ -28,7 +28,7 @@ module UserHelper
   end
 
   def user_thumbnail_tiny(user, options = {})
   end
 
   def user_thumbnail_tiny(user, options = {})

-    options[:class] ||= "user_thumbnail_tiny border border-secondary-subtle"
+    options[:class] ||= "user_thumbnail_tiny border border-secondary-subtle bg-body"

     options[:alt] ||= ""
 
     if user.image_use_gravatar
     options[:alt] ||= ""
 
     if user.image_use_gravatar


@@ -52,20 +52,29 @@ module UserHelper
 
   # External authentication support
 
 
   # External authentication support
 

-  def openid_logo
-    image_tag "openid_small.png", :alt => t("sessions.new.openid_logo_alt"), :class => "align-text-bottom"
-  end
-

   def auth_button(name, provider, options = {})
     link_to(
       image_tag("#{name}.svg",
   def auth_button(name, provider, options = {})
     link_to(
       image_tag("#{name}.svg",

-                :alt => t("sessions.new.auth_providers.#{name}.alt"),
-                :class => "rounded-3",
+                :alt => t("application.auth_providers.#{name}.alt"),
+                :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",
-      :title => t("sessions.new.auth_providers.#{name}.title")
+      :class => "auth_button btn btn-light p-2",
+      :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 border py-2 px-4 d-flex justify-content-center align-items-center",
+      :title => t("application.auth_providers.#{name}.title")

     )
   end
 
     )
   end