Merge pull request #5093 from AntonKhorev/diary-comments-shallow-paths

[rails.git] / app / helpers / user_helper.rb

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index 5b33b57b331f8d842b49c201ae30ef129701de20..0831cde6e21e316759c9a0a8546979b053f38445 100644 (file)
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -2,41 +2,41 @@ module UserHelper
   # User images
 
   def user_image(user, options = {})
   # 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?
     options[:alt] ||= ""
 
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
     elsif user.avatar.attached?

-      image_tag user_avatar_variant(user, :resize => "100x100>"), options
+      user_avatar_variant_tag(user, { :resize_to_limit => [100, 100] }, options)

     else
     else

-      image_tag "avatar_large.png", options
+      image_tag "avatar.svg", options.merge(:width => 100, :height => 100)

     end
   end
 
   def user_thumbnail(user, options = {})
     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
     options[:alt] ||= ""
 
     if user.image_use_gravatar

-      user_gravatar_tag(user, options)
+      user_gravatar_tag(user, options.merge(:size => 50))

     elsif user.avatar.attached?
     elsif user.avatar.attached?

-      image_tag user_avatar_variant(user, :resize => "50x50>"), options
+      user_avatar_variant_tag(user, { :resize_to_limit => [50, 50] }, options)

     else
     else

-      image_tag "avatar_small.png", options
+      image_tag "avatar.svg", options.merge(:width => 50, :height => 50)

     end
   end
 
   def user_thumbnail_tiny(user, options = {})
     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
     options[:alt] ||= ""
 
     if user.image_use_gravatar

-      user_gravatar_tag(user, options)
+      user_gravatar_tag(user, options.merge(:size => 50))

     elsif user.avatar.attached?
     elsif user.avatar.attached?

-      image_tag user_avatar_variant(user, :resize => "50x50>"), options
+      user_avatar_variant_tag(user, { :resize_to_limit => [50, 50] }, options)

     else
     else

-      image_tag "avatar_small.png", options
+      image_tag "avatar.svg", options.merge(:width => 50, :height => 50)

     end
   end
 
     end
   end
 


@@ -44,30 +44,59 @@ module UserHelper
     if user.image_use_gravatar
       user_gravatar_url(user, options)
     elsif user.avatar.attached?
     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)
+      polymorphic_url(user_avatar_variant(user, :resize_to_limit => [100, 100]), :host => Settings.server_url)

     else
     else

-      image_url("avatar_large.png")
+      image_url("avatar.svg")

     end
   end
 
   # External authentication support
 
     end
   end
 
   # External authentication support
 

-  def openid_logo
-    image_tag "openid_small.png", :alt => t("users.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-light p-2",
+      :title => t("application.auth_providers.#{provider}.title")
+    )

   end
 
   end
 

-  def auth_button(name, provider, options = {})
+  def auth_button_preferred(provider, options = {})

     link_to(
     link_to(

-      image_tag("#{name}.svg", :alt => t("users.login.auth_providers.#{name}.alt"), :class => "rounded-lg"),
+      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)),
       auth_path(options.merge(:provider => provider)),

-      :class => "auth_button",
-      :title => t("users.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
     )
   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?
 
   def user_avatar_variant(user, options)
     if user.avatar.variable?


@@ -89,7 +118,7 @@ module UserHelper
 
   def user_gravatar_tag(user, options = {})
     url = user_gravatar_url(user, options)
 
   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
     image_tag url, options
   end
 end