Merge remote-tracking branch 'upstream/pull/3300'

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

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index 5b33b57b331f8d842b49c201ae30ef129701de20..69b0f6d6bc5ca833e9df2983b60596fee60f95d2 100644 (file)
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -8,7 +8,7 @@ module UserHelper
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
     elsif user.avatar.attached?
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
     elsif user.avatar.attached?

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

     else
       image_tag "avatar_large.png", options
     end
     else
       image_tag "avatar_large.png", options
     end


@@ -21,7 +21,7 @@ module UserHelper
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
     elsif user.avatar.attached?
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
     elsif user.avatar.attached?

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

     else
       image_tag "avatar_small.png", options
     end
     else
       image_tag "avatar_small.png", options
     end


@@ -34,7 +34,7 @@ module UserHelper
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
     elsif user.avatar.attached?
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
     elsif user.avatar.attached?

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

     else
       image_tag "avatar_small.png", options
     end
     else
       image_tag "avatar_small.png", options
     end


@@ -44,7 +44,7 @@ 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
       image_url("avatar_large.png")
     end
     else
       image_url("avatar_large.png")
     end


@@ -53,15 +53,16 @@ module UserHelper
   # External authentication support
 
   def openid_logo
   # External authentication support
 
   def openid_logo

-    image_tag "openid_small.png", :alt => t("users.login.openid_logo_alt"), :class => "openid_logo"
+    image_tag "openid_small.png", :alt => t("sessions.new.openid_logo_alt"), :class => "openid_logo"

   end
 
   def auth_button(name, provider, options = {})
     link_to(
   end
 
   def auth_button(name, provider, options = {})
     link_to(

-      image_tag("#{name}.svg", :alt => t("users.login.auth_providers.#{name}.alt"), :class => "rounded-lg"),
+      image_tag("#{name}.svg", :alt => t("sessions.new.auth_providers.#{name}.alt"), :class => "rounded-lg"),

       auth_path(options.merge(:provider => provider)),
       auth_path(options.merge(:provider => provider)),

+      :method => :post,

       :class => "auth_button",
       :class => "auth_button",

-      :title => t("users.login.auth_providers.#{name}.title")
+      :title => t("sessions.new.auth_providers.#{name}.title")

     )
   end
 
     )
   end