adjust case

[citadel.git] / webcit / static / authmethods.js

diff --git a/webcit/static/authmethods.js b/webcit/static/authmethods.js
index 3362a5185b5ed256d9846fd77a06859c5f3565c3..fe7da239e915ff298f5ce53f4a3dbb0cad3cedfd 100644 (file)
--- a/webcit/static/authmethods.js
+++ b/webcit/static/authmethods.js
@@ -38,16 +38,7 @@ function GetLoggedInFirst(destination_url) {
        new Ajax.Request(p, { method: 'get' } );
 
        /* If not logged in, go modal and ask the user to log in first. */
-       new Ajax.Updater(
-               'md-content',
-               'do_template?template=get_logged_in',
-                {
-                        method: 'get',
-                       onSuccess: function() {
-                               toggleModal(1);
-                       }
-                }
-        );
+        toggleModal(1);
 }
 
 
@@ -58,6 +49,10 @@ 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';
+       $('authbox_aol').style.display = 'none';
+       $('authbox_success').style.display = 'none';
        $(show_which_div).style.display = 'block';
 }
 
@@ -81,6 +76,7 @@ function do_auth_popout(popout_url) {
 function ajax_try_username_and_password() {
 
        $('login_errmsg').innerHTML = "";
+       authtoggle('authbox_success');
         $('ajax_username_password_form').request({
                onSuccess: function(ctdlresult) {
                        if (ctdlresult.responseText.substr(0,1) == '2') {
@@ -88,6 +84,7 @@ function ajax_try_username_and_password() {
                        }
                        else {
                                $('login_errmsg').innerHTML = ctdlresult.responseText.substr(4) ;
+                               authtoggle('authbox_userpass');
                        }
                }
        });
@@ -122,6 +119,7 @@ function ajax_try_newuser() {
         $('ajax_newuser_form').request({
                onSuccess: function(ctdlresult) {
                        if (ctdlresult.responseText.substr(0,1) == '2') {
+                               authtoggle('authbox_success');
                                window.location = 'pop';
                        }
                        else {
@@ -182,3 +180,58 @@ 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 Yahoo, 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);
+}
+
+
+/****************** AOL ***********************/
+
+/*
+ * Attempt login with AOL, called from modal dialog
+ */
+function ajax_try_aol() {
+       $('login_errmsg').innerHTML = "";
+       openid_url = encodeURI($('ajax_aol_form').elements["aol_screenname"].value);
+       do_auth_popout("openid_login?openid_url=http://openid.aol.com/" + openid_url);
+}
+
+
+/*
+ * The user pressed a key while in the AOL login box.
+ * Is it the enter/return key?  Submit the form.
+ */
+function aol_onkeypress(e) {
+       if (window.event) {             /* IE */
+               keynum = e.keyCode;
+       }
+       else if (e.which) {             /* real browsers */
+               keynum = e.which;
+       }
+       if (keynum == 13) {             /* enter/return key */
+               ajax_try_aol();
+               return false;
+       }
+       return true;
+}
+
+