From ad997b56ffb5979af4c7a951590e8e0648e28d5b Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@uncensored.citadel.org>
Date: Thu, 1 Dec 2011 15:16:24 -0500
Subject: [PATCH] Support Google and Yahoo login without the user needing to
 know that OpenID is in use.

---
 webcit/static/authmethods.js       | 26 ++++++++++++++++++++++++++
 webcit/static/t/get_logged_in.html | 25 ++++++++++++++++++++-----
 2 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/webcit/static/authmethods.js b/webcit/static/authmethods.js
index 3362a5185..85e9626db 100644
--- a/webcit/static/authmethods.js
+++ b/webcit/static/authmethods.js
@@ -58,6 +58,8 @@ function authtoggle(show_which_div) {
 	$('authbox_userpass').style.display = 'none';
 	$('authbox_newuser').style.display = 'none';
 	$('authbox_openid').style.display = 'none';
+	$('authbox_google').style.display = 'none';
+	$('authbox_yahoo').style.display = 'none';
 	$(show_which_div).style.display = 'block';
 }
 
@@ -182,3 +184,27 @@ function openid_onkeypress(e) {
 }
 
 
+/****************** GOOGLE ***********************/
+
+/*
+ * Attempt login with Google, called from modal dialog
+ */
+function ajax_try_google() {
+	$('login_errmsg').innerHTML = "";
+	openid_url = encodeURI("https://www.google.com/accounts/o8/id");
+	do_auth_popout("openid_login?openid_url=" + openid_url);
+}
+
+
+/****************** GOOGLE ***********************/
+
+/*
+ * Attempt login with Google, called from modal dialog
+ */
+function ajax_try_yahoo() {
+	$('login_errmsg').innerHTML = "";
+	openid_url = encodeURI("http://yahoo.com");
+	do_auth_popout("openid_login?openid_url=" + openid_url);
+}
+
+
diff --git a/webcit/static/t/get_logged_in.html b/webcit/static/t/get_logged_in.html
index c2e7b89ed..95f49d2f9 100644
--- a/webcit/static/t/get_logged_in.html
+++ b/webcit/static/t/get_logged_in.html
@@ -23,13 +23,18 @@
     <a class="ib_button_link" href="javascript:authtoggle('authbox_openid');" title="OpenID"><span>
         OpenID
     </span></a>
+
 </li><??("X", 1)>
-<??("COND:SERV:OPENID",2)>
-<li class="ib_button">
-</li>
+<?!("COND:SERV:OPENID",2)><li class="ib_button" style='background-image: url("/static/webcit_icons/openid-32x32.gif");'>
+    <a class="ib_button_link" href="javascript:authtoggle('authbox_google');" title="Google"><span>
+        Google
+    </span></a>
 </li><??("X", 2)>
-<li class="ib_button">
-</li>
+<?!("COND:SERV:OPENID",3)><li class="ib_button" style='background-image: url("/static/webcit_icons/openid-32x32.gif");'>
+    <a class="ib_button_link" href="javascript:authtoggle('authbox_yahoo');" title="Yahoo"><span>
+        Yahoo
+    </span></a>
+</li><??("X", 3)>
 <li class="ib_button">
 </li>
 <li class="ib_button">
@@ -78,6 +83,16 @@
 <div class="logbuttons"><a href="javascript:ajax_try_openid();"><?_("Log in")></a></div>
 </div>
 
+<div class="authbox" id="authbox_google" style="display: none">
+<h2><?_("Log in using Google")></h2>
+<div class="logbuttons"><a href="javascript:ajax_try_google();"><?_("Log in")></a></div>
+</div>
+
+<div class="authbox" id="authbox_yahoo" style="display: none">
+<h2><?_("Log in using Yahoo")></h2>
+<div class="logbuttons"><a href="javascript:ajax_try_yahoo();"><?_("Log in")></a></div>
+</div>
+
 </div>
 </body>
 </html>
-- 
2.30.2