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

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

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index dd4c343d8d96cafcd1919432fc6318fb85d5ac7f..1fc8e3ed2f1e0b6f82f6e325d0425c278a3d1e87 100644 (file)
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -38,25 +38,27 @@ module UserHelper
     if user.image_use_gravatar
       user_gravatar_url(user, options)
     else
     if user.image_use_gravatar
       user_gravatar_url(user, options)
     else

-      image_url(user.image.url)
+      image_url(user.image.url(:large))

     end
   end
 
   # External authentication support
 
   def openid_logo
     end
   end
 
   # 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
 
   end
 

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

     link_to(
     link_to(

-      image_tag("#{name}.png", :alt => t("user.login.auth_providers.#{name}.alt")),
+      image_tag("#{name}.png", :alt => t("users.login.auth_providers.#{name}.alt")),

       auth_path(options.merge(:provider => provider)),
       :class => "auth_button",
       auth_path(options.merge(:provider => provider)),
       :class => "auth_button",

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

     )
   end
 
     )
   end
 

+  private
+

   # Gravatar support
 
   # See http://en.gravatar.com/site/implement/images/ for details.
   # Gravatar support
 
   # See http://en.gravatar.com/site/implement/images/ for details.