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

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

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index a35da210b1de77d842b2e182d8387ea7128454ad..e9e8f6bfb1e553b0066250c2bcdaa1069d23c2bf 100644 (file)
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -8,7 +8,7 @@ module UserHelper
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
     elsif user.avatar.attached?
-      image_tag user.avatar.variant(:resize => "100x100>"), options
+      image_tag user_avatar_variant(user, :resize => "100x100>"), options
     else
       image_tag "avatar_large.png", options
     end
@@ -21,7 +21,7 @@ module UserHelper
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
     elsif user.avatar.attached?
-      image_tag user.avatar.variant(:resize => "50x50>"), options
+      image_tag user_avatar_variant(user, :resize => "50x50>"), options
     else
       image_tag "avatar_small.png", options
     end
@@ -34,7 +34,7 @@ module UserHelper
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
     elsif user.avatar.attached?
-      image_tag user.avatar.variant(:resize => "50x50>"), options
+      image_tag user_avatar_variant(user, :resize => "50x50>"), options
     else
       image_tag "avatar_small.png", options
     end
@@ -44,7 +44,7 @@ module UserHelper
     if user.image_use_gravatar
       user_gravatar_url(user, options)
     elsif user.avatar.attached?
-      polymorphic_url(user.avatar.variant(:resize => "100x100>"))
+      polymorphic_url(user_avatar_variant(user, :resize => "100x100>"), :host => Settings.server_url)
     else
       image_url("avatar_large.png")
     end
@@ -53,20 +53,31 @@ module UserHelper
   # External authentication support
 
   def openid_logo
-    image_tag "openid_small.png", :alt => t("users.login.openid_logo_alt"), :class => "openid_logo"
+    image_tag "openid_small.png", :alt => t("sessions.new.openid_logo_alt"), :class => "openid_logo"
   end
 
   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("sessions.new.auth_providers.#{name}.alt"), :class => "rounded-lg"),
       auth_path(options.merge(:provider => provider)),
+      :method => :post,
       :class => "auth_button",
-      :title => t("users.login.auth_providers.#{name}.title")
+      :title => t("sessions.new.auth_providers.#{name}.title")
     )
   end
 
   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.