X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/67dbde0fde7f504e2b6ba69edd27b20fa7c143d5..2142ff02c2442d28580ff99080bc1219c2bfe59f:/app/helpers/user_helper.rb?ds=sidebyside diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb index ba37a1334..1fc8e3ed2 100644 --- a/app/helpers/user_helper.rb +++ b/app/helpers/user_helper.rb @@ -38,33 +38,35 @@ module UserHelper if user.image_use_gravatar user_gravatar_url(user, options) else - image_url(user.image.url) + image_url(user.image.url(:large)) end end - # OpenID support + # External authentication 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("users.login.openid_logo_alt"), :class => "openid_logo" end - def openid_button(name, url) + def auth_button(name, provider, options = {}) 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}.png", :alt => t("users.login.auth_providers.#{name}.alt")), + auth_path(options.merge(:provider => provider)), + :class => "auth_button", + :title => t("users.login.auth_providers.#{name}.title") ) end + private + # 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) + 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 = {})