X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/15b104f4ff4614aa78c01180b6a9b89dd5a1400f..325deabc916acab952089a4b093fa6bafa66083c:/app/helpers/user_helper.rb?ds=inline diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb index 27d6faa8c..e00a2253f 100644 --- a/app/helpers/user_helper.rb +++ b/app/helpers/user_helper.rb @@ -2,76 +2,123 @@ module UserHelper # User images def user_image(user, options = {}) - options[:class] ||= "user_image" + options[:class] ||= "user_image border border-secondary-subtle bg-body" options[:alt] ||= "" if user.image_use_gravatar user_gravatar_tag(user, options) + elsif user.avatar.attached? + user_avatar_variant_tag(user, { :resize_to_limit => [100, 100] }, options) else - image_tag user.image.url(:large), options + image_tag "avatar.svg", options.merge(:width => 100, :height => 100) end end def user_thumbnail(user, options = {}) - options[:class] ||= "user_thumbnail" + options[:class] ||= "user_thumbnail border border-secondary-subtle bg-body" options[:alt] ||= "" if user.image_use_gravatar - user_gravatar_tag(user, options) + user_gravatar_tag(user, options.merge(:size => 50)) + elsif user.avatar.attached? + user_avatar_variant_tag(user, { :resize_to_limit => [50, 50] }, options) else - image_tag user.image.url(:small), options + image_tag "avatar.svg", options.merge(:width => 50, :height => 50) end end def user_thumbnail_tiny(user, options = {}) - options[:class] ||= "user_thumbnail_tiny" + options[:class] ||= "user_thumbnail_tiny border border-secondary-subtle bg-body" options[:alt] ||= "" if user.image_use_gravatar - user_gravatar_tag(user, options) + user_gravatar_tag(user, options.merge(:size => 50)) + elsif user.avatar.attached? + user_avatar_variant_tag(user, { :resize_to_limit => [50, 50] }, options) else - image_tag user.image.url(:small), options + image_tag "avatar.svg", options.merge(:width => 50, :height => 50) 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_to_limit => [100, 100]), :host => Settings.server_url) else - image_url(user.image.url) + image_url("avatar.svg") end end # External authentication support - def openid_logo - image_tag "openid_small.png", :alt => t("user.login.openid_logo_alt"), :class => "openid_logo" + def auth_button(provider, options = {}) + link_to( + image_tag("auth_providers/#{provider}.svg", + :alt => t("application.auth_providers.#{provider}.alt"), + :class => "rounded-1", + :size => "36"), + auth_path(options.merge(:provider => provider)), + :method => :post, + :class => "auth_button btn btn-outline-secondary border p-2", + :title => t("application.auth_providers.#{provider}.title") + ) end - def auth_button(name, provider, options = {}) + def auth_button_preferred(provider, options = {}) link_to( - image_tag("#{name}.png", :alt => t("user.login.auth_providers.#{name}.alt")), + image_tag("auth_providers/#{provider}.svg", + :alt => t("application.auth_providers.#{provider}.alt"), + :class => "rounded-1 me-3", + :size => "36") + t("application.auth_providers.#{provider}.title"), auth_path(options.merge(:provider => provider)), - :class => "auth_button", - :title => t("user.login.auth_providers.#{name}.title") + :method => :post, + :class => "auth_button btn btn-outline-secondary border py-2 px-4 d-flex justify-content-center align-items-center", + :title => t("application.auth_providers.#{provider}.title") ) end private + # Local avatar support + def user_avatar_variant_tag(user, variant_options, options) + if user.avatar.variable? + variant = user.avatar.variant(variant_options) + # https://stackoverflow.com/questions/61893089/get-metadata-of-active-storage-variant/67228171 + if variant.send(:processed?) + metadata = variant.processed.send(:record).image.blob.metadata + if metadata["width"] + options[:width] = metadata["width"] + options[:height] = metadata["height"] + end + end + image_tag variant, options + else + image_tag user.avatar, options + end + end + + 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") + 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 = {}) url = user_gravatar_url(user, options) - options.delete(:size) + options[:height] = options[:width] = options.delete(:size) || 100 image_tag url, options end end