Commit 98415652 authored by Leigh Stoller's avatar Leigh Stoller

Minor fix to embedding.

parent 7aefdaa1
......@@ -246,7 +246,7 @@ function Do_VerifySpeaksfor()
return;
}
if (isset($ajax_args["embedded"])) {
$embedded = 1;
$embedded = $ajax_args["embedded"];
}
#
......
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().
......
......@@ -199,6 +199,7 @@ function SPITFORM($uid, $referrer, $error)
src='https://www.emulab.net/protogeni/speaks-for/geni-auth.js'>
</script>\n";
}
echo "<div id='waitwait_div'></div>\n";
echo "<script src='js/lib/jquery-2.0.3.min.js'></script>\n";
echo "<script src='js/lib/bootstrap.js'></script>\n";
echo "<script src='js/lib/require.js' data-main='js/login'></script>";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment