Extract 3rd party login buttons from login screen

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

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index e1ab423a1e4b567b57f6a83c4e5ff072ed6d0d8d..d0b2f0be550a47874e150eef4be3c1cb94d722e5 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-grey"
+    options[:class] ||= "user_image border border-secondary-subtle bg-body"

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


@@ -10,12 +10,12 @@ module UserHelper
     elsif user.avatar.attached?
       user_avatar_variant_tag(user, { :resize_to_limit => [100, 100] }, options)
     else
     elsif user.avatar.attached?
       user_avatar_variant_tag(user, { :resize_to_limit => [100, 100] }, options)
     else

-      image_tag "avatar_large.png", options.merge(:width => 100, :height => 100)
+      image_tag "avatar.svg", options.merge(:width => 100, :height => 100)

     end
   end
 
   def user_thumbnail(user, options = {})
     end
   end
 
   def user_thumbnail(user, options = {})

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

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


@@ -23,12 +23,12 @@ module UserHelper
     elsif user.avatar.attached?
       user_avatar_variant_tag(user, { :resize_to_limit => [50, 50] }, options)
     else
     elsif user.avatar.attached?
       user_avatar_variant_tag(user, { :resize_to_limit => [50, 50] }, options)
     else

-      image_tag "avatar_small.png", options.merge(:width => 50, :height => 50)
+      image_tag "avatar.svg", options.merge(:width => 50, :height => 50)

     end
   end
 
   def user_thumbnail_tiny(user, options = {})
     end
   end
 
   def user_thumbnail_tiny(user, options = {})

-    options[:class] ||= "user_thumbnail_tiny border border-grey"
+    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


@@ -36,7 +36,7 @@ module UserHelper
     elsif user.avatar.attached?
       user_avatar_variant_tag(user, { :resize_to_limit => [50, 50] }, options)
     else
     elsif user.avatar.attached?
       user_avatar_variant_tag(user, { :resize_to_limit => [50, 50] }, options)
     else

-      image_tag "avatar_small.png", options.merge(:width => 50, :height => 50)
+      image_tag "avatar.svg", options.merge(:width => 50, :height => 50)

     end
   end
 
     end
   end
 


@@ -46,26 +46,26 @@ module UserHelper
     elsif user.avatar.attached?
       polymorphic_url(user_avatar_variant(user, :resize_to_limit => [100, 100]), :host => Settings.server_url)
     else
     elsif user.avatar.attached?
       polymorphic_url(user_avatar_variant(user, :resize_to_limit => [100, 100]), :host => Settings.server_url)
     else

-      image_url("avatar_large.png")
+      image_url("avatar.svg")

     end
   end
 
   # External authentication support
 
   def openid_logo
     end
   end
 
   # External authentication support
 
   def openid_logo

-    image_tag "openid_small.png", :alt => t("sessions.new.openid_logo_alt"), :class => "align-text-bottom"
+    image_tag "openid_small.png", :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",
   end
 
   def auth_button(name, provider, options = {})
     link_to(
       image_tag("#{name}.svg",

-                :alt => t("sessions.new.auth_providers.#{name}.alt"),
+                :alt => t("application.auth_providers.#{name}.alt"),

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

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

     )
   end
 
     )
   end