Commit d2eb80d3 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Minor changes after page renames.

parent 16f09b2b
...@@ -466,8 +466,8 @@ function StartResizeWatchdog(uuid) ...@@ -466,8 +466,8 @@ function StartResizeWatchdog(uuid)
function resizeFunction() { function resizeFunction() {
console.info("resizing topo"); console.info("resizing topo");
// Must clear the div for the D3 library. // Must clear the div for the D3 library.
$("#showtopo_div").html("<div></div>"); $("#showtopo_statuspage").html("<div></div>");
$("#showtopo_div").removeClass("invisible"); $("#showtopo_statuspage").removeClass("invisible");
ShowTopo(uuid); ShowTopo(uuid);
} }
...@@ -481,7 +481,7 @@ function StartResizeWatchdog(uuid) ...@@ -481,7 +481,7 @@ function StartResizeWatchdog(uuid)
// after the user stops dinking around. // after the user stops dinking around.
// //
$(window).resize(function() { $(window).resize(function() {
$("#showtopo_div").addClass("invisible"); $("#showtopo_statuspage").addClass("invisible");
clearTimeout(resizeTimer); clearTimeout(resizeTimer);
resizeTimer = setTimeout(resizeFunction, 250); resizeTimer = setTimeout(resizeFunction, 250);
......
...@@ -226,6 +226,6 @@ else { ...@@ -226,6 +226,6 @@ else {
# #
# Zap back to front page in secure mode. # Zap back to front page in secure mode.
# #
header("Location: $APTBASE/quickvm.php"); header("Location: $APTBASE/instantiate.php");
} }
?> ?>
...@@ -271,7 +271,7 @@ function SPITFORM($formfields, $errors) ...@@ -271,7 +271,7 @@ function SPITFORM($formfields, $errors)
if ($editing) { if ($editing) {
echo " <a class='btn btn-primary btn-sm pull-right' echo " <a class='btn btn-primary btn-sm pull-right'
style='margin-right: 10px;' style='margin-right: 10px;'
href='quickvm.php?profile=$idx' href='instantiate.php?profile=$idx'
type='submit' name='create'>Instantiate</a>\n"; type='submit' name='create'>Instantiate</a>\n";
echo " <a class='btn btn-danger btn-sm pull-left' echo " <a class='btn btn-danger btn-sm pull-left'
style='margin-right: 10px;' style='margin-right: 10px;'
......
...@@ -143,7 +143,7 @@ function SPITHEADER($thinheader = 0) ...@@ -143,7 +143,7 @@ function SPITHEADER($thinheader = 0)
echo " </ul> echo " </ul>
<ul class='nav navbar-nav navbar-left'> <ul class='nav navbar-nav navbar-left'>
<li><a class='btn btn-quickvm-home navbar-btn' <li><a class='btn btn-quickvm-home navbar-btn'
href='quickvm.php'>Home</a></li>\n"; href='instantiate.php'>Home</a></li>\n";
if (!$disable_accounts) { if (!$disable_accounts) {
echo " <li id='quickvm_actions_menu' class='dropdown ". echo " <li id='quickvm_actions_menu' class='dropdown ".
(!$login_user ? "hidden" : "") . "'>" . (!$login_user ? "hidden" : "") . "'>" .
......
...@@ -542,7 +542,7 @@ if (!$this_user) { ...@@ -542,7 +542,7 @@ if (!$this_user) {
TBERROR("Could not add new user to project group $pid", 1); TBERROR("Could not add new user to project group $pid", 1);
} }
$group->NewMemberNotify($user); $group->NewMemberNotify($user);
header("Location: quickvm.php"); header("Location: instantiate.php");
return; return;
} }
......
...@@ -75,7 +75,7 @@ if (!$quickvm) { ...@@ -75,7 +75,7 @@ if (!$quickvm) {
SPITFOOTER(); SPITFOOTER();
flush(); flush();
sleep(3); sleep(3);
PAGEREPLACE("quickvm.php"); PAGEREPLACE("instantiate.php");
return; return;
} }
$creator = GeniUser::Lookup("sa", $quickvm->creator_uuid()); $creator = GeniUser::Lookup("sa", $quickvm->creator_uuid());
...@@ -279,7 +279,7 @@ echo " window.APT_OPTIONS.sliceExpires = '" . $slice_expires . "';\n"; ...@@ -279,7 +279,7 @@ echo " window.APT_OPTIONS.sliceExpires = '" . $slice_expires . "';\n";
echo " window.APT_OPTIONS.creatorUid = '" . $creator_uid . "';\n"; echo " window.APT_OPTIONS.creatorUid = '" . $creator_uid . "';\n";
echo " window.APT_OPTIONS.creatorEmail = '" . $creator_email . "';\n"; echo " window.APT_OPTIONS.creatorEmail = '" . $creator_email . "';\n";
echo "</script>\n"; echo "</script>\n";
echo "<script src='js/lib/require.js' data-main='js/quickvm_status'></script>"; echo "<script src='js/lib/require.js' data-main='js/status'></script>";
# #
# A modal to tell people how to register # A modal to tell people how to register
......
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