Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

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

diff --git a/webcit/static/authmethods.js b/webcit/static/authmethods.js
index f66f8bcf91cf16ed1adbe1493b142d9eb6b15080..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);
 }
 
 
@@ -93,6 +84,7 @@ function ajax_try_username_and_password() {
                        }
                        else {
                                $('login_errmsg').innerHTML = ctdlresult.responseText.substr(4) ;
+                               authtoggle('authbox_userpass');
                        }
                }
        });