Commit ef494560 authored by Leigh Stoller's avatar Leigh Stoller

Some format changes so that the terminate option looks nice. Also

added terminate options to the experiment and batch display pages.
parent eb6e539c
......@@ -62,6 +62,7 @@ $def_boot_path = $row[def_boot_path];
$def_boot_cmd_line = $row[def_boot_cmd_line];
$next_boot_path = $row[next_boot_path];
$next_boot_cmd_line = $row[next_boot_cmd_line];
$rpms = $row[rpms];
$startupcmd = $row[startupcmd];
echo "<table border=2 cellpadding=0 cellspacing=2
......@@ -131,13 +132,20 @@ echo "<tr>
echo "<tr>
<td>Startup Command:</td>
<td>Startup Command[1]:</td>
<td class=\"left\">
<input type=\"text\" name=\"startupcmd\" size=\"60\"
value=\"$startupcmd\"></td>
</tr>\n";
echo "<tr>
<td>RPMs[2]:</td>
<td class=\"left\">
<input type=\"text\" name=\"rpms\" size=\"60\"
value=\"$rpms\"></td>
</tr>\n";
echo "<tr>
<td colspan=2 align=center>
<b><input type=\"submit\" value=\"Submit\"></b>
......@@ -146,6 +154,15 @@ echo "<tr>
</form>
</table>\n";
echo "<p>
<dl COMPACT>
<dt> [1]
<dd> Node startup command must be a pathname. You may also include
optional arguments.
<dt> [2]
<dd> RPMs must be a comma separated list of pathnames.
</dl>\n";
#
# Standard Testbed Footer
#
......
......@@ -105,12 +105,12 @@ echo "<tr>
</tr>\n";
echo "<tr>
<td>Extimated #PCs: </td>
<td>Estimated #PCs: </td>
<td class=\"left\">$numpcs</td>
</tr>\n";
echo "<tr>
<td>Extimated #Sharks: </td>
<td>Estimated #Sharks: </td>
<td class=\"left\">$numsharks</td>
</tr>\n";
......@@ -121,6 +121,12 @@ echo "<tr>
echo "</table>\n";
# Terminate option.
echo "<p><center>
Do you want to terminate this batch experiment?
<A href='endbatch.php3?exp_pideid=$exp_pid\$\$$exp_eid'>Yes</a>
</center>\n";
#
# Dump experiment record if its currently running.
#
......
......@@ -63,6 +63,12 @@ echo "<center>
</center>\n";
SHOWEXP($exp_pid, $exp_eid);
# Terminate option.
echo "<p><center>
Do you want to terminate this experiment?
<A href='endexp.php3?exp_pideid=$exp_pid\$\$$exp_eid'>Yes</a>
</center>\n";
#
# Dump the node information.
#
......
......@@ -55,13 +55,13 @@ if (mysql_num_rows($experiments_result)) {
<h2>Running Experiments</h2>
</center>\n";
echo "<table width=\"100%\" border=2
echo "<table border=2 cols=0
cellpadding=0 cellspacing=2 align=center>
<tr>
<td>PID</td>
<td>EID</td>
<td>Name</td>
<td align=center>Terminate</td>
<td width=10%>PID</td>
<td width=20%>EID</td>
<td width=5% align=center>Terminate</td>
<td width=65%>Name</td>
</tr>\n";
while ($row = mysql_fetch_array($experiments_result)) {
......@@ -73,10 +73,10 @@ if (mysql_num_rows($experiments_result)) {
<td><A href='showproject.php3?pid=$pid'>$pid</A></td>
<td><A href='showexp.php3?exp_pideid=$pid\$\$$eid'>
$eid</A></td>
<td>$name</td>
<td align=center>
<A href='endexp.php3?exp_pideid=$pid\$\$$eid'>
<img alt=\"o\" src=\"redball.gif\"></A></td>
<td>$name</td>
</tr>\n";
}
echo "</table>\n";
......@@ -87,13 +87,13 @@ if (mysql_num_rows($batch_result)) {
<h2>Batch Mode Experiments</h2>
</center>\n";
echo "<table width=\"100%\" border=2
echo "<table border=2
cellpadding=0 cellspacing=2 align=center>
<tr>
<td>PID</td>
<td>EID</td>
<td>Name</td>
<td align=center>Terminate</td>
<td width=10%>PID</td>
<td width=20%>EID</td>
<td width=5% align=center>Terminate</td>
<td width=65%>Name</td>
</tr>\n";
while ($row = mysql_fetch_array($batch_result)) {
......@@ -105,10 +105,10 @@ if (mysql_num_rows($batch_result)) {
<td><A href='showproject.php3?pid=$pid'>$pid</A></td>
<td><A href='showbatch.php3?exp_pideid=$pid\$\$$eid'>
$eid</A></td>
<td>$name</td>
<td align=center>
<A href='endbatch.php3?exp_pideid=$pid\$\$$eid'>
<img alt=\"o\" src=\"redball.gif\"></A></td>
<td>$name</td>
</tr>\n";
}
echo "</table>\n";
......
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