X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/28a19f5f136b5ad30636049bb204b2b16cf3227a..b0150caee632110eb5b305f9937b94473101645a:/app/helpers/user_helper.rb diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb index 6ef654fda..d48837166 100644 --- 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" + options[:alt] ||= "" 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" + options[:alt] ||= "" 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" + options[:alt] ||= "" if user.image_use_gravatar user_gravatar_tag(user, options) @@ -42,14 +45,14 @@ module UserHelper # 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) link_to( image_tag("#{name}.png", :alt => t("user.login.openid_providers.#{name}.alt")), - "#", - :class => "openid_button", :data => { :url => url }, + auth_path(:provider => "openid", :openid_url => url), + :class => "openid_button", :title => t("user.login.openid_providers.#{name}.title") ) end @@ -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 - hash = Digest::MD5::hexdigest(user.email.downcase) + 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)}" + "#{request.protocol}www.gravatar.com/avatar/#{hash}.jpg?s=#{size}&d=#{u(default_image_url)}" end def user_gravatar_tag(user, options = {})