Changeset 29338

Timestamp:

Oct 6, 2010, 11:22:48 AM (16 years ago)

Author:

rhenders

Message:

removed all the '0's when nothing pending; re-formmatted a bit

File:

• trunk/ippMonitor/raw/czartool_labels.php (modified) (10 diffs)

trunk/ippMonitor/raw/czartool_labels.php

@@ -235 +235 @@
 #
 ###########################################################################
-function createLabelsTable($pass, $proj, $db, $server, $labels, $distLabels, $pubLabels, $stages, $states, $selectedState, $selectedLabel, $selectedStage, $plotType) {
+function createLabelsTable(
+        $pass, 
+        $proj, 
+        $db, 
+        $server, 
+        $labels, 
+        $distLabels, 
+        $pubLabels, 
+        $stages, 
+        $states, 
+        $selectedState, 
+        $selectedLabel, $selectedStage, $plotType) {
 
     // set up table columns
@@ -251 +262 @@
         if ($stage == "burntool") continue;
         $reverting = getRevertStatus($db, $stage);
-        $link = "czartool_labels.php?pass=".$pass."&proj=".$proj."&label=".$selectedLabel."&stage=".$selectedStage."&plottype=".$plotType."&revertstage=".$stage."&revertmode=";
+        $link = 
+            "czartool_labels.php?pass=".$pass
+            ."&proj=".$proj
+            ."&label=".$selectedLabel
+            ."&stage=".$selectedStage
+            ."&plottype=".$plotType
+            ."&revertstage=".$stage
+            ."&revertmode=";
+
         if(!$reverting) {$label =  "Start";$link = $link . "on";}
         if($reverting) {$label = "Stop";$link = $link . "off";}
@@ -266 +285 @@
 
         if ($stage == $selectedStage) $link = "";
-        else $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=" . $selectedLabel . "&stage=".$stage."&plottype=".$plotType;
+        else $link = 
+            "czartool_labels.php?pass=".$pass
+                ."&proj=".$proj 
+                ."&label=".$selectedLabel
+                ."&stage=".$stage
+                ."&plottype=".$plotType;
+
         write_table_cell($class, '%s', $link, $stage);
     }
 
     if ($selectedStage=="all_stages") $link = "";
-    else $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=" . $selectedLabel . "&stage=all_stages"."&plottype=".$plotType;
+    else $link = 
+        "czartool_labels.php?pass=".$pass
+            ."&proj=".$proj
+            ."&label=".$selectedLabel
+            ."&stage=all_stages"
+            ."&plottype=".$plotType;
+
     write_table_cell($class, '%s', $link, "All stages");
 
@@ -277 +308 @@
     echo "<tr><td></td>\n";
 
-    $defaultlink = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj."&label=".$selectedLabel."&stage=".$selectedStage."&plottype=".$plotType;
+    $defaultlink = 
+        "czartool_labels.php?pass=".$pass
+        ."&proj=".$proj
+        ."&label=".$selectedLabel
+        ."&stage=".$selectedStage
+        ."&plottype=".$plotType;
 
     // write rows
@@ -295 +331 @@
         // create link to label summary page for each label
         if ($thisLabel == $selectedLabel) $link = "";
-        else $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=" . $thisLabel . "&stage=" . $selectedStage."&plottype=".$plotType;
+        else $link = 
+            "czartool_labels.php?pass=".$pass
+                ."&proj=".$proj
+                ."&label=".$thisLabel
+                ."&stage=".$selectedStage
+                ."&plottype=".$plotType;
 
         echo "<tr><td></td>\n";
@@ -445 +486 @@
     $faults = $row[1];
 
-    $str = "$pending";
+    if ($pending == 0)
+        $str = "";
+    else
+        $str = "$pending";
 
     if ($state == "new") {
@@ -470 +514 @@
     write_header_cell($class, "Server");
     write_header_cell($class, "Alive?");
-    $link = "czartool_labels.php?pass=".$pass."&proj=".$proj."&label=".$selectedLabel."&stage=".$selectedStage."&plottype=".$plotType."&allservercmd=stop";
+    $link = "czartool_labels.php?pass=".$pass
+        ."&proj=".$proj
+        ."&label=".$selectedLabel
+        ."&stage=".$selectedStage
+        ."&plottype=".$plotType
+        ."&allservercmd=stop";
+
     write_table_cell($class, '%s', $link, "Stop all");
-    $link = "czartool_labels.php?pass=".$pass."&proj=".$proj."&label=".$selectedLabel."&stage=".$selectedStage."&plottype=".$plotType."&allservercmd=run";
+    $link = "czartool_labels.php?pass=".$pass
+        ."&proj=".$proj
+        ."&label=".$selectedLabel
+        ."&stage=".$selectedStage
+        ."&plottype=".$plotType
+        ."&allservercmd=run";
+
     write_table_cell($class, '%s', $link, "Run all");
     echo "</tr>\n";
@@ -481 +537 @@
 
         echo "<tr><td></td>\n";
-        $link = "czartool_labels.php?pass=".$pass."&proj=".$proj."&server=".$server."&label=".$selectedLabel."&stage=".$selectedStage."&plottype=".$plotType;
+        $link = "czartool_labels.php?pass=".$pass
+            ."&proj=".$proj
+            ."&server=".$server
+            ."&label=".$selectedLabel
+            ."&stage=".$selectedStage
+            ."&plottype=".$plotType;
+
         write_table_cell($class, '%s', $link, $server);
         write_table_cell($class, '%s', "", $alive ? "yes" : "NO");
@@ -487 +549 @@
         if ($alive) {
 
-            $link = "czartool_labels.php?pass=".$pass."&proj=".$proj."&label=".$selectedLabel."&stage=".$selectedStage."&plottype=".$plotType."&server=".$server."&servercmd=";
+            $link = "czartool_labels.php?pass=".$pass
+                ."&proj=".$proj
+                ."&label=".$selectedLabel
+                ."&stage=".$selectedStage
+                ."&plottype=".$plotType
+                ."&server=".$server
+                ."&servercmd=";
+
             if ($running)  {
 
@@ -502 +571 @@
         }
         else {
-        
+
             write_table_cell($class, '%s', "", "");
             write_table_cell($class, '%s', "", "");