diff --git a/www/aptui/geni-login.ajax b/www/aptui/geni-login.ajax index 230e94ec937838a3b5259c43b86b6d82cadfa81c..aa73bf90a3a2d08de1860b86d76aa6b1c4fa6ddd 100644 --- a/www/aptui/geni-login.ajax +++ b/www/aptui/geni-login.ajax @@ -246,7 +246,7 @@ function Do_VerifySpeaksfor() return; } if (isset($ajax_args["embedded"])) { - $embedded = 1; + $embedded = $ajax_args["embedded"]; } # diff --git a/www/aptui/js/login.js b/www/aptui/js/login.js index 83a40dc0859f5576d7fa62d5167e170fee7663ee..58b35a3f19d17536c98923e4f8f28b749072f14a 100644 --- a/www/aptui/js/login.js +++ b/www/aptui/js/login.js @@ -1,6 +1,7 @@ require(window.APT_OPTIONS.configObject, - ['underscore', 'js/quickvm_sup'], -function (_, sup) + ['underscore', 'js/quickvm_sup', + 'js/lib/text!template/waitwait-modal.html'], +function (_, sup, waitwaitString) { 'use strict'; var embedded = 0; @@ -8,6 +9,7 @@ function (_, sup) function initialize() { embedded = window.EMBEDDED; + $('#waitwait_div').html(waitwaitString); // We share code with the modal version of login, and the // handler for the button is installed in initialize(). diff --git a/www/aptui/login.php b/www/aptui/login.php index c2018b9a04787aabcff689a2f7604b8346f0e7c7..d3957d0064f7575f2aa7db5b4e205910d236f131 100644 --- a/www/aptui/login.php +++ b/www/aptui/login.php @@ -199,6 +199,7 @@ function SPITFORM($uid, $referrer, $error) src='https://www.emulab.net/protogeni/speaks-for/geni-auth.js'> \n"; } + echo "
\n"; echo "\n"; echo "\n"; echo "";