Convert OpenID authentication to use OmniAuth

[rails.git] / app / views / user / login.html.erb

diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb
index 2b667c7250ecd9d2d0bc1606f2f80f06b45dc2c0..9fdeb3ab3bc1892502445675de456997f9933950 100644 (file)
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -42,8 +42,8 @@
 
         <ul class='clearfix' id="login_openid_buttons">
           <li><%= link_to image_tag("openid.png", :alt => t("user.login.openid_providers.openid.title")), "#", :id => "openid_open_url", :title => t("user.login.openid_providers.openid.title") %></li>
 
         <ul class='clearfix' id="login_openid_buttons">
           <li><%= link_to image_tag("openid.png", :alt => t("user.login.openid_providers.openid.title")), "#", :id => "openid_open_url", :title => t("user.login.openid_providers.openid.title") %></li>

-          <li><%= openid_button "google", "gmail.com" %></li>
-          <li><%= openid_button "yahoo", "me.yahoo.com" %></li>
+          <li><%= openid_button "google", "https://www.google.com/accounts/o8/id" %></li>
+          <li><%= openid_button "yahoo", "yahoo.com" %></li>

           <li><%= openid_button "wordpress", "wordpress.com" %></li>
           <li><%= openid_button "aol", "aol.com" %></li>
         </ul>
           <li><%= openid_button "wordpress", "wordpress.com" %></li>
           <li><%= openid_button "aol", "aol.com" %></li>
         </ul>


@@ -83,11 +83,6 @@ $(document).ready(function() {
     $("#login_openid_submit").show();
   });
 
     $("#login_openid_submit").show();
   });
 

-  $(".openid_button").click(function() {
-    $("#openid_url").val($(this).attr("data-url"));
-    $("#login_form").submit();
-  });
-

   $("#login_openid_url").hide();
   $("#login_openid_submit").hide();
 });
   $("#login_openid_url").hide();
   $("#login_openid_submit").hide();
 });