Merge branch 'master' into openstreetbugs

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

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index 8686d5a035c80751081aad9d3f3c1a1b89b2d037..6a239df5d723d02f0b02f2fa5e68e58871a94a1d 100644 (file)
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -1,16 +1,26 @@
 module UserHelper
 module UserHelper

+  def user_image(user, options = {})
+    options[:class] ||= "user_image"
+
+    image_tag user.image.url(:large), options
+  end
+
+  def user_thumbnail(user, options = {})
+    options[:class] ||= "user_thumbnail"
+
+    image_tag user.image.url(:small), options
+  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 openid_logo
     image_tag "openid_small.png", :alt => t('user.login.openid_logo_alt'), :class => "openid_logo"
   end
 
   def openid_button(name, url)

-    link_to_function(
+    link_to(

       image_tag("#{name}.png", :alt => t("user.login.openid_providers.#{name}.alt")),
       image_tag("#{name}.png", :alt => t("user.login.openid_providers.#{name}.alt")),

-      nil,
+      "#",
+      :class => "openid_button", :data => { :url => url },

       :title => t("user.login.openid_providers.#{name}.title")
       :title => t("user.login.openid_providers.#{name}.title")

-    ) do |page|
-      page[:login_form][:openid_url][:value] = url
-      page[:login_form].submit()
-    end
+    )

   end
 end
   end
 end