Fix unclosed labels in account details

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

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index 6a239df5d723d02f0b02f2fa5e68e58871a94a1d..7113cf1b2d48bd324545031de8dbcd403349be02 100644 (file)
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -1,16 +1,46 @@
 module UserHelper
 module UserHelper

+  # User images
+

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

-    image_tag user.image.url(:large), options
+    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"
 
   end
 
   def user_thumbnail(user, options = {})
     options[:class] ||= "user_thumbnail"
 

-    image_tag user.image.url(:small), options
+    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"
+
+    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
+      "http://#{SERVER_URL}#{image_path(user.image.url)}"
+    end

   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_logo
     image_tag "openid_small.png", :alt => t('user.login.openid_logo_alt'), :class => "openid_logo"
   end


@@ -23,4 +53,20 @@ module UserHelper
       :title => t("user.login.openid_providers.#{name}.title")
     )
   end
       :title => t("user.login.openid_providers.#{name}.title")
     )
   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 = "http://#{SERVER_URL}#{image_path("users/images/large.png")}"
+    url = "http://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