Return the "large" image from the user details API call

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

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index a3d5980862f3a6eae01a3eb2037f13941efc7280..065a562c4d282ad977ef51733b9f687a811bf988 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
 
     end
   end
 

-  # OpenID support
+  # External authentication support

 
   def openid_logo
     image_tag "openid_small.png", :alt => t("user.login.openid_logo_alt"), :class => "openid_logo"
   end
 
 
   def openid_logo
     image_tag "openid_small.png", :alt => t("user.login.openid_logo_alt"), :class => "openid_logo"
   end
 

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

     link_to(
     link_to(

-      image_tag("#{name}.png", :alt => t("user.login.openid_providers.#{name}.alt")),
-      "#",
-      :class => "openid_button", :data => { :url => url },
-      :title => t("user.login.openid_providers.#{name}.title")
+      image_tag("#{name}.png", :alt => t("user.login.auth_providers.#{name}.alt")),
+      auth_path(options.merge(:provider => provider)),
+      :class => "auth_button",
+      :title => t("user.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.