X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..e434cb154c5ccecd7fc0ce672e4de79bd9e7e06f:/app/helpers/user_helper.rb?ds=inline diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb index b5bf30645..dd4c343d8 100644 --- a/app/helpers/user_helper.rb +++ b/app/helpers/user_helper.rb @@ -42,18 +42,18 @@ module UserHelper 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("user.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("user.login.auth_providers.#{name}.alt")), + auth_path(options.merge(:provider => provider)), + :class => "auth_button", + :title => t("user.login.auth_providers.#{name}.title") ) end @@ -64,7 +64,7 @@ module UserHelper 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)}" + "#{request.protocol}www.gravatar.com/avatar/#{hash}.jpg?s=#{size}&d=#{u(default_image_url)}" end def user_gravatar_tag(user, options = {})