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

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

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index c22fef1ea2fa71e8d2f0a922a89e13316d5c5564..5b33b57b331f8d842b49c201ae30ef129701de20 100644 (file)
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -8,9 +8,7 @@ module UserHelper
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
     elsif user.avatar.attached?
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
     elsif user.avatar.attached?

-      image_tag user.avatar.variant(:resize => "100x100>"), options
-    elsif user.image.file?
-      image_tag user.image.url(:large), options
+      image_tag user_avatar_variant(user, :resize => "100x100>"), options

     else
       image_tag "avatar_large.png", options
     end
     else
       image_tag "avatar_large.png", options
     end


@@ -23,9 +21,7 @@ module UserHelper
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
     elsif user.avatar.attached?
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
     elsif user.avatar.attached?

-      image_tag user.avatar.variant(:resize => "50x50>"), options
-    elsif user.image.file?
-      image_tag user.image.url(:small), options
+      image_tag user_avatar_variant(user, :resize => "50x50>"), options

     else
       image_tag "avatar_small.png", options
     end
     else
       image_tag "avatar_small.png", options
     end


@@ -38,9 +34,7 @@ module UserHelper
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
     elsif user.avatar.attached?
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
     elsif user.avatar.attached?

-      image_tag user.avatar.variant(:resize => "50x50>"), options
-    elsif user.image.file?
-      image_tag user.image.url(:small), options
+      image_tag user_avatar_variant(user, :resize => "50x50>"), options

     else
       image_tag "avatar_small.png", options
     end
     else
       image_tag "avatar_small.png", options
     end


@@ -50,9 +44,7 @@ module UserHelper
     if user.image_use_gravatar
       user_gravatar_url(user, options)
     elsif user.avatar.attached?
     if user.image_use_gravatar
       user_gravatar_url(user, options)
     elsif user.avatar.attached?

-      url_for(user.avatar.variant(:resize => "100x100>"))
-    elsif user.image.file?
-      image_url(user.image.url(:large))
+      polymorphic_url(user_avatar_variant(user, :resize => "100x100>"), :host => Settings.server_url)

     else
       image_url("avatar_large.png")
     end
     else
       image_url("avatar_large.png")
     end


@@ -66,7 +58,7 @@ module UserHelper
 
   def auth_button(name, provider, options = {})
     link_to(
 
   def auth_button(name, provider, options = {})
     link_to(

-      image_tag("#{name}.png", :alt => t("users.login.auth_providers.#{name}.alt")),
+      image_tag("#{name}.svg", :alt => t("users.login.auth_providers.#{name}.alt"), :class => "rounded-lg"),

       auth_path(options.merge(:provider => provider)),
       :class => "auth_button",
       :title => t("users.login.auth_providers.#{name}.title")
       auth_path(options.merge(:provider => provider)),
       :class => "auth_button",
       :title => t("users.login.auth_providers.#{name}.title")


@@ -75,6 +67,16 @@ module UserHelper
 
   private
 
 
   private
 

+  # Local avatar support
+
+  def user_avatar_variant(user, options)
+    if user.avatar.variable?
+      user.avatar.variant(options)
+    else
+      user.avatar
+    end
+  end
+

   # Gravatar support
 
   # See http://en.gravatar.com/site/implement/images/ for details.
   # Gravatar support
 
   # See http://en.gravatar.com/site/implement/images/ for details.