Merge remote-tracking branch 'upstream/master' into vagrant

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

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index 006a3d32f887213e11ddb057d4ccf13aecfbbff1..ba37a13341a7e2486d6c0192e6c1a63e9b3bd64a 100644 (file)
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -1,12 +1,75 @@
 module UserHelper
+  # User images
+
+  def user_image(user, options = {})
+    options[:class] ||= "user_image"
+    options[:alt] ||= ""
+
+    if user.image_use_gravatar
+      user_gravatar_tag(user, options)
+    else
+      image_tag user.image.url(:large), options
+    end
+  end
+
+  def user_thumbnail(user, options = {})
+    options[:class] ||= "user_thumbnail"
+    options[:alt] ||= ""
+
+    if user.image_use_gravatar
+      user_gravatar_tag(user, options)
+    else
+      image_tag user.image.url(:small), options
+    end
+  end
+
+  def user_thumbnail_tiny(user, options = {})
+    options[:class] ||= "user_thumbnail_tiny"
+    options[:alt] ||= ""
+
+    if user.image_use_gravatar
+      user_gravatar_tag(user, options)
+    else
+      image_tag user.image.url(:small), options
+    end
+  end
+
+  def user_image_url(user, options = {})
+    if user.image_use_gravatar
+      user_gravatar_url(user, options)
+    else
+      image_url(user.image.url)
+    end
+  end
+
+  # OpenID support
+
+  def openid_logo
+    image_tag "openid_small.png", :alt => t('user.login.openid_logo_alt'), :class => "openid_logo"
+  end
+
   def openid_button(name, url)
-    link_to_function(
+    link_to(
       image_tag("#{name}.png", :alt => t("user.login.openid_providers.#{name}.alt")),
-      nil,
+      "#",
+      :class => "openid_button", :data => { :url => url },
       :title => t("user.login.openid_providers.#{name}.title")
-    ) do |page|
-      page[:login_form][:user_openid_url][:value] = url
-      page[:login_form].submit()
-    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("users/images/large.png")
+    url = "#{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