Index: trunk/ippMonitor/raw/czartool_labels.php
===================================================================
--- trunk/ippMonitor/raw/czartool_labels.php	(revision 29031)
+++ trunk/ippMonitor/raw/czartool_labels.php	(revision 29056)
@@ -39,5 +39,5 @@
 if ($selectedStage == "") { $selectedStage = "all_stages"; }
 
-echo 'Some documentation can be found <a href="http://svn.pan-starrs.ifa.hawaii.edu/trac/ipp/wiki/Processing">here</a><br>';
+echo "<p  align=\"center\"> Current status of the IPP as of $lastUpdateTime (faults are shown in parentheses). <br>Documentation can be found <a href=\"http://svn.pan-starrs.ifa.hawaii.edu/trac/ipp/wiki/Processing\">here</a> and cluster load monitored <a href=\"http://ganglia.pan-starrs.ifa.hawaii.edu/?r=hour&s=descending&c=IPP%2520Production\">here</a></p>";
 
 // deal with reverts: turn on or off if requested and pass current revert state for this stage onto labels table later
@@ -66,5 +66,5 @@
 
 $states=array("full","new","drop","wait");
-$stages=array("chip","cam","fake","warp","stack","diff","magic","magicDS","dist");
+$stages=array("burntool", "chip","cam","fake","warp","stack","diff","magic","magicDS","dist");
 $servers=array(
         "addstar",
@@ -87,5 +87,4 @@
 echo "<input type=\"hidden\" name=\"menu\" value=\"$menu\">\n";
 echo "</form>\n";
-echo "<p  align=\"center\"> Current status of IPP (any faults are shown in parentheses). NOTE: This data is good as of: $lastUpdateTime </p>";
 
 echo "<table>\n";
@@ -231,5 +230,5 @@
     echo "<tr><td></td>\n";
 
-    echo "<p  align=\"center\"> Current labels for $server server </p>";
+    echo "<p  align=\"center\"> Current labels for $server server (D=distributing, P=publishing)</p>";
 
     write_header_cell($class, "");
@@ -238,4 +237,5 @@
     foreach ($stages as &$stage) {
 
+        if ($stage == "burntool") continue;
         $reverting = getRevertStatus($db, $stage);
         $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=" . $selectedLabel . "&stage=" . $selectedStage . "&revertstage=" . $stage . "&revertmode=";
@@ -249,7 +249,6 @@
     echo "</tr>\n";
     echo "<tr><td></td>\n";
+    write_header_cell($class, " ");
     write_header_cell($class, "Label (in order of priority)");
-    write_header_cell($class, "Distributing?");
-    write_header_cell($class, "Publishing?");
     foreach ($stages as &$stage) {
         
@@ -287,10 +286,17 @@
 
         echo "<tr><td></td>\n";
+        $distPub = " ";
+        if ($distributing) $distPub = "D";
+        if ($publishing) $distPub = $distPub . "P";
+        write_table_cell($class, '%s', "", $distPub);
+
         write_table_cell($class, '%s', $link, $thisLabel);
-        write_table_cell($class, '%s', "", $distributing ? "yes" : "NO");
-        write_table_cell($class, '%s', "", $publishing ? "yes" : "NO");
 
         $str = "";
         $anyFaults = false; 
+
+        $link = $defaultlink;
+        getStateAndFaults($db, $thisLabel, $selectedState, "burntool", $str, $anyFaults);
+        write_table_cell($class, '%s', $anyFaults ? $link : "", $str);
 
         $link = "failedChipProcessedImfile.php?pass=" . $pass . "&proj=" . $proj . "&chipRun.label=" . $thisLabel . "&chipRun.state=new";
@@ -337,4 +343,5 @@
 
     echo "<tr><td></td>\n";
+    write_table_cell($class, '%s', "", " ");
     write_table_cell($class, '%s', $link, "All $server labels");