X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..bf9dd8f350ca1b54afb79dda79506d980ccb5738:/app/helpers/user_helper.rb?ds=sidebyside diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb index b5bf30645..74f16380c 100644 --- a/app/helpers/user_helper.rb +++ b/app/helpers/user_helper.rb @@ -7,8 +7,10 @@ module UserHelper if user.image_use_gravatar user_gravatar_tag(user, options) + elsif user.avatar.attached? + image_tag user_avatar_variant(user, :resize => "100x100>"), options else - image_tag user.image.url(:large), options + image_tag "avatar_large.png", options end end @@ -18,8 +20,10 @@ module UserHelper if user.image_use_gravatar user_gravatar_tag(user, options) + elsif user.avatar.attached? + image_tag user_avatar_variant(user, :resize => "50x50>"), options else - image_tag user.image.url(:small), options + image_tag "avatar_small.png", options end end @@ -29,42 +33,58 @@ module UserHelper if user.image_use_gravatar user_gravatar_tag(user, options) + elsif user.avatar.attached? + image_tag user_avatar_variant(user, :resize => "50x50>"), options else - image_tag user.image.url(:small), options + image_tag "avatar_small.png", options end end def user_image_url(user, options = {}) if user.image_use_gravatar user_gravatar_url(user, options) + elsif user.avatar.attached? + polymorphic_url(user_avatar_variant(user, :resize => "100x100>"), :host => Settings.server_url) else - image_url(user.image.url) + image_url("avatar_large.png") 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 + + # Local avatar support + + def user_avatar_variant(user, options) + if user.avatar.variable? + user.avatar.variant(options) + else + user.avatar + end + 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 = image_url("users/images/large.png") - url = "#{request.protocol}www.gravatar.com/avatar/#{hash}.jpg?s=#{size}&d=#{u(default_image_url)}" + default_image_url = image_url("avatar_large.png") + "#{request.protocol}www.gravatar.com/avatar/#{hash}.jpg?s=#{size}&d=#{u(default_image_url)}" end def user_gravatar_tag(user, options = {})