Commit bbc26e5b authored by Mike Hibler's avatar Mike Hibler

Fix a few more sort-related issues while I was in the neighborhood.

Hardwire the sort type for a few columns that cause guessType grief.

Remove the insertion of blank-rows-as-spacers in a table. They don't
sort well. Leigh got rid of most of these a while back.
parent 4b4da239
......@@ -1518,7 +1518,7 @@ function ShowExperimentList_internal($templates_only,
($templates_only ?
"Template Instances" : "Experiments") . "</h3>
</center>
<table align=center border=1 class=class id=$id>\n";
<table align=center border=1 class=$class id=$id>\n";
if ($nopid) {
$pidrow="";
......@@ -1528,11 +1528,11 @@ function ShowExperimentList_internal($templates_only,
echo "<thead class='sort'>";
echo "<tr>$pidrow
<th>EID</th>
<th class='sorttable_alpha'>EID</th>
<th>State</th>
<th align=center>Nodes [1]</th>
<th align=center>Hours Idle [2]</th>
<th>Description</th>
<th class='sorttable_alpha'>Description</th>
</tr></thead>\n";
$idlemark = "<b>*</b>";
......@@ -1567,7 +1567,9 @@ function ShowExperimentList_internal($templates_only,
}
$idlestr = $idlehours;
$skey = 0;
if ($idlehours > 0) {
$skey = $idlehours;
if ($stale) { $idlestr .= $stalemark; }
if ($ignore) { $idlestr = "($idlestr)"; $parens=1; }
} elseif ($idlehours == -1) { $idlestr = "&nbsp;"; }
......@@ -1576,7 +1578,7 @@ function ShowExperimentList_internal($templates_only,
<td><a href='showexp.php3?pid=$pid&eid=$eid'>$eid</a></td>
<td>$state</td>
<td align=center>$nodes</td>
<td align=center>$idlestr</td>
<td align=center sorttable_customkey='$skey'>$idlestr</td>
<td>$name</td>
</tr>\n";
}
......
<?php
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
# All rights reserved.
#
include("defs.php3");
......@@ -108,9 +108,9 @@ if (mysql_num_rows($query_result)) {
echo "<thead class='sort'>
<tr>
<th>Image</th>
<th>PID</th>
<th>Description</th>
<th class='sorttable_alpha'>Image</th>
<th class='sorttable_alpha'>PID</th>
<th class='sorttable_alpha'>Description</th>
</tr>
</thead>\n";
......
<?php
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
# All rights reserved.
#
include("defs.php3");
......@@ -187,8 +187,8 @@ function GENPLIST ($query_result)
<thead class='sort'>
<tr>\n";
echo "<th>PID</th>\n";
echo "<th>(Approved?) Description</th>\n";
echo "<th class='sorttable_alpha'>PID</th>\n";
echo "<th class='sorttable_alpha'>(Approved?) Description</th>\n";
if ($showtype != "ProtoGENI") {
echo "<th>Leader</th>\n";
echo "<th>Affil</th>\n";
......@@ -249,10 +249,10 @@ function GENPLIST ($query_result)
if ($isadmin && $showtype != "ProtoGENI") {
if ($public) {
echo "<td align=center><img alt='Y' src='greenball.gif'></td>";
echo "<td align=center sorttable_customkey='1'><img alt='Y' src='greenball.gif'></td>";
}
else {
echo "<td align=center><img alt='N' src='redball.gif'></td>\n";
echo "<td align=center sorttable_customkey='2'><img alt='N' src='redball.gif'></td>\n";
}
}
echo "</tr>\n";
......
<?php
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
# All rights reserved.
#
#
......@@ -222,7 +222,6 @@ function SHOWNODES($pid, $eid, $sortby, $showclass) {
echo " </tr></thead>\n";
$stalemark = "<b>?</b>";
$count = 0;
$sharednodes = 0;
while ($row = mysql_fetch_array($query_result)) {
......@@ -263,11 +262,6 @@ function SHOWNODES($pid, $eid, $sortby, $showclass) {
if (!$vname)
$vname = "--";
if ($count & 1) {
echo "<tr></tr>\n";
}
$count++;
echo "<tr>
<td><a href='shownode.php3?node_id=$node_id'>$node_id</a>";
if (isset($sharemode) && $sharemode == "using_shared_local") {
......
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