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

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

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index 1fc8e3ed2f1e0b6f82f6e325d0425c278a3d1e87..69b0f6d6bc5ca833e9df2983b60596fee60f95d2 100644 (file)
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -7,8 +7,10 @@ module UserHelper
 
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
 
     if user.image_use_gravatar
       user_gravatar_tag(user, options)

+    elsif user.avatar.attached?
+      image_tag user_avatar_variant(user, :resize_to_limit => [100, 100]), options

     else
     else

-      image_tag user.image.url(:large), options
+      image_tag "avatar_large.png", options

     end
   end
 
     end
   end
 


@@ -18,8 +20,10 @@ module UserHelper
 
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
 
     if user.image_use_gravatar
       user_gravatar_tag(user, options)

+    elsif user.avatar.attached?
+      image_tag user_avatar_variant(user, :resize_to_limit => [50, 50]), options

     else
     else

-      image_tag user.image.url(:small), options
+      image_tag "avatar_small.png", options

     end
   end
 
     end
   end
 


@@ -29,43 +33,58 @@ module UserHelper
 
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
 
     if user.image_use_gravatar
       user_gravatar_tag(user, options)

+    elsif user.avatar.attached?
+      image_tag user_avatar_variant(user, :resize_to_limit => [50, 50]), options

     else
     else

-      image_tag user.image.url(:small), options
+      image_tag "avatar_small.png", options

     end
   end
 
   def user_image_url(user, options = {})
     if user.image_use_gravatar
       user_gravatar_url(user, options)
     end
   end
 
   def user_image_url(user, options = {})
     if user.image_use_gravatar
       user_gravatar_url(user, options)

+    elsif user.avatar.attached?
+      polymorphic_url(user_avatar_variant(user, :resize_to_limit => [100, 100]), :host => Settings.server_url)

     else
     else

-      image_url(user.image.url(:large))
+      image_url("avatar_large.png")

     end
   end
 
   # External authentication support
 
   def openid_logo
     end
   end
 
   # 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(
   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)),
       auth_path(options.merge(:provider => provider)),

+      :method => :post,

       :class => "auth_button",
       :class => "auth_button",

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

     )
   end
 
   private
 
     )
   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.
   def user_gravatar_url(user, options = {})
     size = options[:size] || 100
     hash = Digest::MD5.hexdigest(user.email.downcase)
   # Gravatar support
 
   # See http://en.gravatar.com/site/implement/images/ for details.
   def user_gravatar_url(user, options = {})
     size = options[:size] || 100
     hash = Digest::MD5.hexdigest(user.email.downcase)

-    default_image_url = image_url("users/images/large.png")
+    default_image_url = image_url("avatar_large.png")

     "#{request.protocol}www.gravatar.com/avatar/#{hash}.jpg?s=#{size}&d=#{u(default_image_url)}"
   end
 
     "#{request.protocol}www.gravatar.com/avatar/#{hash}.jpg?s=#{size}&d=#{u(default_image_url)}"
   end