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 eb2b34e9066ec59e1419a959bcfe995d6803ecf8..7a9a75c3134d7a1fe36b5a2272e2e19494f84212 100644 (file)
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -1,12 +1,13 @@
 module UserHelper
+  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(
       image_tag("#{name}.png", :alt => t("user.login.openid_providers.#{name}.alt")),
-      nil,
-      :title => t("user.login.openid_providers.#{name}.title")      
-    ) do |page|
-      page[:login_form][:user_openid_url][:value] = url
-      page[:login_form].submit()
-    end
+      "submitOpenidUrl('#{url}')",
+      :title => t("user.login.openid_providers.#{name}.title")
+    )
   end
 end