Commit 1605bf1e authored by Leigh B. Stoller's avatar Leigh B. Stoller

Fix another Eric nit:

  + On the swap-in status page (showing the swap-in progress), there's a link
    to the template page but no link to the instance page.  Conversely, on the
    swap-out page ("Terminate Instance"), there's a link to the instance but
    not to the template.
parent fb5112c7
...@@ -138,14 +138,20 @@ elseif (!strcmp($inout, "restart")) { ...@@ -138,14 +138,20 @@ elseif (!strcmp($inout, "restart")) {
} }
if ($instance) { if ($instance) {
echo "<font size=+2>Template Instance <b>"; $guid = $instance->guid();
$version = $instance->vers();
echo "<font size=+2>Template <b>" .
MakeLink("template",
"guid=$guid&version=$version", "$guid/$version") .
"</b>, Instance <b>";
} }
else { else {
echo "<font size=+2>Experiment <b>"; echo "<font size=+2>Experiment <b>";
} }
echo "<a href='showproject.php3?pid=$pid'>$pid</a>/". echo MakeLink("project", "pid=$pid", $pid) . "/" .
"<a href='showexp.php3?pid=$pid&eid=$eid'>$eid</a></b></font>\n"; MakeLink("experiment", "pid=$pid&eid=$eid", $eid);
echo "<br>\n"; echo "</b></font><br>\n";
flush(); flush();
# A locked down experiment means just that! # A locked down experiment means just that!
...@@ -233,11 +239,13 @@ TBGroupUnixInfo($exp_pid, $exp_gid, $unix_gid, $unix_name); ...@@ -233,11 +239,13 @@ TBGroupUnixInfo($exp_pid, $exp_gid, $unix_gid, $unix_name);
if ($instance) { if ($instance) {
$guid = $instance->guid(); $guid = $instance->guid();
$version = $instance->vers(); $version = $instance->vers();
echo "<br>\n"; echo "<br>\n";
echo "<b>Terminating template instance!</b> ... "; echo "<center>\n";
echo "this will take a few minutes; please be patient."; echo "<b>Terminating template instance!</b> ... <br>\n";
echo "This will take a few minutes; please be patient.<br>\n";
echo "<br>\n"; echo "<br>\n";
echo "</center>\n";
flush(); flush();
} }
......
...@@ -1387,6 +1387,9 @@ function MakeLink($which, $args, $text) ...@@ -1387,6 +1387,9 @@ function MakeLink($which, $args, $text)
elseif ($which == "run") { elseif ($which == "run") {
$page = "experimentrun_show.php"; $page = "experimentrun_show.php";
} }
elseif ($which == "experiment") {
$page = "showexp.php";
}
return "<a href=${page}?${args}>$text</a>"; return "<a href=${page}?${args}>$text</a>";
} }
......
...@@ -103,7 +103,9 @@ function SPITFORM($instance, $formfields, $parameters, $errors) ...@@ -103,7 +103,9 @@ function SPITFORM($instance, $formfields, $parameters, $errors)
# Table of inputs. # Table of inputs.
# #
echo "<tr> echo "<tr>
<td class='pad4'>Formal Parameters:</td> <td class='pad4'>Formal Parameters:<br>
<font color=red>(Currently Ignored!)</font>
</td>
<td> <td>
<table cellpadding=0 cellspacing=0 border=0>\n"; <table cellpadding=0 cellspacing=0 border=0>\n";
......
...@@ -135,7 +135,7 @@ WRITESUBMENUBUTTON("Add Metadata", ...@@ -135,7 +135,7 @@ WRITESUBMENUBUTTON("Add Metadata",
WRITESUBMENUBUTTON("Template Archive", WRITESUBMENUBUTTON("Template Archive",
"archive_view.php3?exptidx=$exptidx"); "archive_view.php3?exptidx=$exptidx");
WRITESUBMENUBUTTON("Template History", WRITESUBMENUBUTTON("Template Record",
"template_history.php?guid=$guid&version=$version"); "template_history.php?guid=$guid&version=$version");
SUBMENUEND_2A(); SUBMENUEND_2A();
......
...@@ -557,10 +557,13 @@ set_time_limit(0); ...@@ -557,10 +557,13 @@ set_time_limit(0);
# Okay, we can spit back a header now that there is no worry of redirect. # Okay, we can spit back a header now that there is no worry of redirect.
PAGEHEADER("Instantiate Experiment Template"); PAGEHEADER("Instantiate Experiment Template");
echo "<font size=+2>Experiment Template <b>" . echo "<font size=+2>Template <b>" .
MakeLink("template", MakeLink("template",
"guid=$guid&version=$version", "$guid/$version") . "guid=$guid&version=$version", "$guid/$version") .
"</b></font>\n"; "</b>, Instance <b>" .
MakeLink("project", "pid=$pid", $pid) . "/" .
MakeLink("experiment", "pid=$pid&eid=$eid", $eid);
echo "</b></font>\n";
echo "<br><br>\n"; echo "<br><br>\n";
echo "<script type='text/javascript' language='javascript' ". echo "<script type='text/javascript' language='javascript' ".
......
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