Eliminate templating from most javascript

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

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index 55b1d21ab63b89839b754e4ab870b11aa5262bf1..a3d5980862f3a6eae01a3eb2037f13941efc7280 100644 (file)
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -3,6 +3,7 @@ module UserHelper
 
   def user_image(user, options = {})
     options[:class] ||= "user_image"
 
   def user_image(user, options = {})
     options[:class] ||= "user_image"

+    options[:alt] ||= ""

 
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
 
     if user.image_use_gravatar
       user_gravatar_tag(user, options)


@@ -13,6 +14,7 @@ module UserHelper
 
   def user_thumbnail(user, options = {})
     options[:class] ||= "user_thumbnail"
 
   def user_thumbnail(user, options = {})
     options[:class] ||= "user_thumbnail"

+    options[:alt] ||= ""

 
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
 
     if user.image_use_gravatar
       user_gravatar_tag(user, options)


@@ -23,6 +25,7 @@ module UserHelper
 
   def user_thumbnail_tiny(user, options = {})
     options[:class] ||= "user_thumbnail_tiny"
 
   def user_thumbnail_tiny(user, options = {})
     options[:class] ||= "user_thumbnail_tiny"

+    options[:alt] ||= ""

 
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
 
     if user.image_use_gravatar
       user_gravatar_tag(user, options)


@@ -42,7 +45,7 @@ module UserHelper
   # OpenID support
 
   def openid_logo
   # OpenID support
 
   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("user.login.openid_logo_alt"), :class => "openid_logo"

   end
 
   def openid_button(name, url)
   end
 
   def openid_button(name, url)


@@ -59,9 +62,9 @@ module UserHelper
   # See http://en.gravatar.com/site/implement/images/ for details.
   def user_gravatar_url(user, options = {})
     size = options[:size] || 100
   # 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)
+    hash = Digest::MD5.hexdigest(user.email.downcase)

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

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

   end
 
   def user_gravatar_tag(user, options = {})
   end
 
   def user_gravatar_tag(user, options = {})