X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a6b655862eb4c26e06c434990f864e8d96f27019..ae00fa84c8f981e909c61ab31b6115bb96e859cc:/app/helpers/user_helper.rb?ds=inline diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb index 1064e95c7..0831cde6e 100644 --- a/app/helpers/user_helper.rb +++ b/app/helpers/user_helper.rb @@ -2,7 +2,7 @@ module UserHelper # User images def user_image(user, options = {}) - options[:class] ||= "user_image border border-grey" + options[:class] ||= "user_image border border-secondary-subtle bg-body" options[:alt] ||= "" if user.image_use_gravatar @@ -10,12 +10,12 @@ module UserHelper elsif user.avatar.attached? user_avatar_variant_tag(user, { :resize_to_limit => [100, 100] }, options) else - image_tag "avatar_large.png", options.merge(:width => 100, :height => 100) + image_tag "avatar.svg", options.merge(:width => 100, :height => 100) end end def user_thumbnail(user, options = {}) - options[:class] ||= "user_thumbnail border border-grey" + options[:class] ||= "user_thumbnail border border-secondary-subtle bg-body" options[:alt] ||= "" if user.image_use_gravatar @@ -23,12 +23,12 @@ module UserHelper elsif user.avatar.attached? user_avatar_variant_tag(user, { :resize_to_limit => [50, 50] }, options) else - image_tag "avatar_small.png", options.merge(:width => 50, :height => 50) + image_tag "avatar.svg", options.merge(:width => 50, :height => 50) end end def user_thumbnail_tiny(user, options = {}) - options[:class] ||= "user_thumbnail_tiny border border-grey" + options[:class] ||= "user_thumbnail_tiny border border-secondary-subtle bg-body" options[:alt] ||= "" if user.image_use_gravatar @@ -36,7 +36,7 @@ module UserHelper elsif user.avatar.attached? user_avatar_variant_tag(user, { :resize_to_limit => [50, 50] }, options) else - image_tag "avatar_small.png", options.merge(:width => 50, :height => 50) + image_tag "avatar.svg", options.merge(:width => 50, :height => 50) end end @@ -46,23 +46,35 @@ module UserHelper elsif user.avatar.attached? polymorphic_url(user_avatar_variant(user, :resize_to_limit => [100, 100]), :host => Settings.server_url) else - image_url("avatar_large.png") + image_url("avatar.svg") end end # External authentication support - def openid_logo - image_tag "openid_small.png", :alt => t("sessions.new.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-light 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}.svg", :alt => t("sessions.new.auth_providers.#{name}.alt"), :class => "rounded-3"), + 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)), :method => :post, - :class => "auth_button", - :title => t("sessions.new.auth_providers.#{name}.title") + :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 @@ -73,7 +85,7 @@ module UserHelper if user.avatar.variable? variant = user.avatar.variant(variant_options) # https://stackoverflow.com/questions/61893089/get-metadata-of-active-storage-variant/67228171 - if variant.processed? + if variant.send(:processed?) metadata = variant.processed.send(:record).image.blob.metadata if metadata["width"] options[:width] = metadata["width"]