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 70125e8047e5f1fc13f35dad24a59da2d5148846..e9e8f6bfb1e553b0066250c2bcdaa1069d23c2bf 100644 (file)
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -1,32 +1,96 @@
 module UserHelper
 module UserHelper

+  # User images
+

   def user_image(user, options = {})
     options[:class] ||= "user_image"
   def user_image(user, options = {})
     options[:class] ||= "user_image"

+    options[:alt] ||= ""

 
 

-    image_tag user.image.url(:large), options
+    if user.image_use_gravatar
+      user_gravatar_tag(user, options)
+    elsif user.avatar.attached?
+      image_tag user_avatar_variant(user, :resize => "100x100>"), options
+    else
+      image_tag "avatar_large.png", options
+    end

   end
 
   def user_thumbnail(user, options = {})
     options[:class] ||= "user_thumbnail"
   end
 
   def user_thumbnail(user, options = {})
     options[:class] ||= "user_thumbnail"

+    options[:alt] ||= ""

 
 

-    image_tag user.image.url(:small), options
+    if user.image_use_gravatar
+      user_gravatar_tag(user, options)
+    elsif user.avatar.attached?
+      image_tag user_avatar_variant(user, :resize => "50x50>"), options
+    else
+      image_tag "avatar_small.png", options
+    end

   end
 
   def user_thumbnail_tiny(user, options = {})
     options[:class] ||= "user_thumbnail_tiny"
   end
 
   def user_thumbnail_tiny(user, options = {})
     options[:class] ||= "user_thumbnail_tiny"

+    options[:alt] ||= ""
+
+    if user.image_use_gravatar
+      user_gravatar_tag(user, options)
+    elsif user.avatar.attached?
+      image_tag user_avatar_variant(user, :resize => "50x50>"), options
+    else
+      image_tag "avatar_small.png", options
+    end
+  end

 
 

-    image_tag user.image.url(:small), options
+  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 => "100x100>"), :host => Settings.server_url)
+    else
+      image_url("avatar_large.png")
+    end

   end
 
   end
 

+  # External authentication support
+

   def openid_logo
   def openid_logo

-    image_tag "openid_small.png", :alt => t('user.login.openid_logo_alt'), :class => "openid_logo"
+    image_tag "openid_small.png", :alt => t("sessions.new.openid_logo_alt"), :class => "openid_logo"

   end
 
   end
 

-  def openid_button(name, url)
+  def auth_button(name, provider, options = {})

     link_to(
     link_to(

-      image_tag("#{name}.png", :alt => t("user.login.openid_providers.#{name}.alt")),
-      "#",
-      :class => "openid_button", :data => { :url => url },
-      :title => t("user.login.openid_providers.#{name}.title")
+      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("sessions.new.auth_providers.#{name}.title")

     )
   end
     )
   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)
+    default_image_url = image_url("avatar_large.png")
+    "#{request.protocol}www.gravatar.com/avatar/#{hash}.jpg?s=#{size}&d=#{u(default_image_url)}"
+  end
+
+  def user_gravatar_tag(user, options = {})
+    url = user_gravatar_url(user, options)
+    options.delete(:size)
+    image_tag url, options
+  end

 end
 end