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.

www/swapexp.php3

@@ -138,14 +138,20 @@ elseif (!strcmp($inout, "restart")) {
 }
 
 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 {
     echo "<font size=+2>Experiment <b>";
 }
-echo "<a href='showproject.php3?pid=$pid'>$pid</a>/".
-     "<a href='showexp.php3?pid=$pid&eid=$eid'>$eid</a></b></font>\n";
-echo "<br>\n";
+echo MakeLink("project", "pid=$pid", $pid) . "/" .
+     MakeLink("experiment", "pid=$pid&eid=$eid", $eid);
+echo "</b></font><br>\n";
 flush();
 
 # A locked down experiment means just that!
@@ -233,11 +239,13 @@ TBGroupUnixInfo($exp_pid, $exp_gid, $unix_gid, $unix_name);
 if ($instance) {
     $guid = $instance->guid();
     $version = $instance->vers();
-    
+
     echo "<br>\n";
-    echo "<b>Terminating template instance!</b> ... ";
-    echo "this will take a few minutes; please be patient.";
+    echo "<center>\n";
+    echo "<b>Terminating template instance!</b> ... <br>\n";
+    echo "This will take a few minutes; please be patient.<br>\n";
     echo "<br>\n";
+    echo "</center>\n";
     flush();
 }
 

www/template_defs.php

@@ -1387,6 +1387,9 @@ function MakeLink($which, $args, $text)
     elseif ($which == "run") {
 	$page = "experimentrun_show.php";
     }
+    elseif ($which == "experiment") {
+	$page = "showexp.php";
+    }
     return "<a href=${page}?${args}>$text</a>";
 }
 

www/template_exprun.php

@@ -103,7 +103,9 @@ function SPITFORM($instance, $formfields, $parameters, $errors)
 	# Table of inputs.
 	#
 	echo "<tr>
-		  <td class='pad4'>Formal Parameters:</td>
+		  <td class='pad4'>Formal Parameters:<br>
+                             <font color=red>(Currently Ignored!)</font>
+                    </td>
 		  <td>
  		    <table cellpadding=0 cellspacing=0 border=0>\n";
 	

www/template_show.php

@@ -135,7 +135,7 @@ WRITESUBMENUBUTTON("Add Metadata",
 WRITESUBMENUBUTTON("Template Archive",
 		   "archive_view.php3?exptidx=$exptidx");
 
-WRITESUBMENUBUTTON("Template History",
+WRITESUBMENUBUTTON("Template Record",
 		   "template_history.php?guid=$guid&version=$version");
 
 SUBMENUEND_2A();

www/template_swapin.php

@@ -557,10 +557,13 @@ set_time_limit(0);
 # Okay, we can spit back a header now that there is no worry of redirect.
 PAGEHEADER("Instantiate Experiment Template");
 
-echo "<font size=+2>Experiment Template <b>" .
+echo "<font size=+2>Template <b>" .
         MakeLink("template",
-		 "guid=$guid&version=$version", "$guid/$version") . 
-      "</b></font>\n";
+		 "guid=$guid&version=$version", "$guid/$version") .
+        "</b>, Instance <b>" .
+        MakeLink("project", "pid=$pid", $pid) . "/" .
+        MakeLink("experiment", "pid=$pid&eid=$eid", $eid);
+echo "</b></font>\n";
 echo "<br><br>\n";
 
 echo "<script type='text/javascript' language='javascript' ".