Index: trunk/ippMonitor/raw/czartool_labels.php
===================================================================
--- trunk/ippMonitor/raw/czartool_labels.php	(revision 29676)
+++ trunk/ippMonitor/raw/czartool_labels.php	(revision 29709)
@@ -103,64 +103,146 @@
 echo "</form>\n";
 
-echo "<table>\n";
-echo "<tr>\n";
-echo "<td>\n";
-echo "<img src=\"czartool_getplot.php?type=t&label=$selectedLabel&stage=$selectedStage&plottype=$plotType\"><br>";
-echo "</td>\n";
-
-echo "<td> \n";
-createLabelsTable($pass, $proj, $czardb, "stdscience", $stdsLabels, $distLabels, $pubLabels, $stages, $states, "new", $selectedLabel, $selectedStage, $plotType);
-echo "</td>\n";
-echo "</tr>\n";
-
-echo "<tr>\n";
-echo "<td>\n";
-echo "<img src=\"czartool_getplot.php?type=h&label=$selectedLabel&stage=$selectedStage&plottype=linear\"><br>";
-echo "</td>\n";
-
-echo "<td> \n";
-createLabelsTable($pass, $proj, $czardb, "update", $updateLabels, $distLabels, $pubLabels, $stages, $states, "new", $selectedLabel, $selectedStage, $plotType);
-echo "</td>\n";
-echo "</tr>\n";
-
-echo "<tr>\n";
-echo "<table>\n";
-echo "<tr valign=top>\n";
-echo "<td> \n";
-echo "<img src=\"czartool_getplot.php?type=s\"><br>";
-echo "</td>\n";
-echo "<td>\n";
-createServersTable($pass, $proj,$czardb, $servers, $selectedLabel, $selectedStage, $plotType);
-echo "</td>\n";
-
-echo "<td> \n";
-$today = date("Y-m-d");
-showSummitData($gpc1db, $today);
-echo "</td>\n";
-echo "</tr>\n";
-echo "<tr>\n";
-echo "<td>\n";
-# This is awful
-echo "<table border=\"1\"><tr><td colspan=\"2\"><b>Databases Replication Status</b></td></tr>";
-echo "<tr><td colspan=\"2\">Update fix log <a href=\"http://svn.pan-starrs.ifa.hawaii.edu/trac/ipp/wiki/Replication_Issues\">here</a></td></tr>";
-echo "<tr><td>Database</td><td>Replication Status</td></tr>";
-showReplicationsStatus($REPL_HOST_GPC1, $REPL_USER_GPC1, $REPL_PASSWORD_GPC1, $REPL_DBNAME_GPC1);
-showReplicationsStatus($REPL_HOST_NEBULOUS, $REPL_USER_NEBULOUS, $REPL_PASSWORD_NEBULOUS, $REPL_DBNAME_NEBULOUS);
-echo "</table>";
-echo "</td>\n";
-echo "</tr>\n";
-echo "</table>\n";
-
-echo "<table>\n";
-echo "<tr valign=top>\n";
-echo "<td> \n";
-echo "</td>\n";
-echo "<td>\n";
-if ($selectedServer && !$serverCmd) showServerStatus($selectedServer);
-echo "</td>\n";
-echo "</tr>\n";
-echo "</table>\n";
-echo "</tr>\n";
-echo "</table>\n";
+  echo "<table>\n";
+
+
+  # 1st row
+    echo "<tr>\n";
+      echo "<td> \n";
+        echo "<table>\n";
+          echo "<tr valign=center>\n";
+            echo "<td> \n";
+              # timeseries plot
+              echo "<img src=\"czartool_getplot.php?type=t&label=$selectedLabel&stage=$selectedStage&plottype=$plotType\"><br>";
+            echo "</td>\n";
+            echo "<td>\n";
+              createLabelsTable($pass, 
+                      $proj, 
+                      $czardb, 
+                      "stdscience", 
+                      $stdsLabels, 
+                      $distLabels, 
+                      $pubLabels, 
+                      $stages, 
+                      $states, 
+                      "new", 
+                      $selectedLabel, 
+                      $selectedStage, 
+                      $plotType);
+            echo "</td>\n";
+          echo "</tr>\n";
+        echo "</table>\n";
+      echo "</td> \n";
+    echo "</tr>\n";
+
+
+
+    # 2nd row
+    echo "<tr>\n";
+      echo "<td> \n";
+        echo "<table>\n";
+          echo "<tr valign=center>\n";
+            echo "<td> \n";
+              # rate plot
+              echo "<img src=\"czartool_getplot.php?type=r&label=$selectedLabel&stage=$selectedStage&plottype=linear\"><br>";
+            echo "</td>\n";
+            echo "<td>\n";
+            createLabelsTable($pass, 
+                    $proj, 
+                    $czardb, 
+                    "update", 
+                    $updateLabels, 
+                    $distLabels, 
+                    $pubLabels, 
+                    $stages, 
+                    $states, 
+                    "new", 
+                    $selectedLabel, 
+                    $selectedStage, 
+                    $plotType);
+            echo "</td>\n";
+          echo "</tr>\n";
+        echo "</table>\n";
+      echo "</td> \n";
+    echo "</tr>\n";
+
+
+    # 3rd row
+    echo "<tr>\n";
+      echo "<td> \n";
+        echo "<table>\n";
+          echo "<tr valign=top>\n";
+            echo "<td> \n";
+              # histogram plot
+              echo "<img src=\"czartool_getplot.php?type=h&label=$selectedLabel&stage=$selectedStage&plottype=linear\"><br>";
+            echo "</td>\n";
+            echo "<td>\n";
+              createServersTable($pass, $proj,$czardb, $servers, $selectedLabel, $selectedStage, $plotType);
+            echo "</td>\n";
+
+            echo "<td> \n";
+              $today = date("Y-m-d");
+              showSummitData($gpc1db, $today);
+            echo "</td>\n";
+          echo "</tr>\n";
+        echo "</table>\n";
+      echo "</td> \n";
+    echo "</tr>\n";
+
+
+    # 4th row
+    echo "<tr>\n";
+      echo "<td>\n";
+        echo "<table>\n";
+          echo "<tr valign=top>\n";
+            echo "<td> \n";
+              # storage plot
+              echo "<img src=\"czartool_getplot.php?type=s\"><br>";
+            echo "</td>\n";
+            echo "<td>\n";
+            # This is awful
+              echo "<table border=\"1\"><tr><td colspan=\"2\"><b>Databases Replication Status</b></td></tr>";
+                echo "<tr><td colspan=\"2\">Update fix log <a href=\"http://svn.pan-starrs.ifa.hawaii.edu/trac/ipp/wiki/Replication_Issues\">here</a></td></tr>";
+                echo "<tr><td>Database</td><td>Replication Status</td></tr>";
+                showReplicationsStatus($REPL_HOST_GPC1, $REPL_USER_GPC1, $REPL_PASSWORD_GPC1, $REPL_DBNAME_GPC1);
+                showReplicationsStatus($REPL_HOST_NEBULOUS, $REPL_USER_NEBULOUS, $REPL_PASSWORD_NEBULOUS, $REPL_DBNAME_NEBULOUS);
+              echo "</table>";
+            echo "</td>\n";
+          echo "</tr>\n";
+        echo "</table>\n";
+      echo "</td> \n";
+    echo "</tr>\n";
+
+    # 5th row
+    echo "<tr>\n";
+      echo "<td> \n";
+        echo "<table>\n";
+          echo "<tr valign=top>\n";
+            echo "<td> \n";
+              # server output
+              if ($selectedServer && !$serverCmd) showServerStatus($selectedServer);
+            echo "</td>\n";
+            echo "<td>\n";
+            echo "</td>\n";
+          echo "</tr>\n";
+        echo "</table>\n";
+      echo "</td> \n";
+    echo "</tr>\n";
+
+    #echo "<tr>\n";
+     # echo "<td>\n";
+    #  echo "<table>\n";
+     #   echo "<tr valign=top>\n";
+      #    echo "<td> \n";
+       #   echo "</td>\n";
+        #  echo "<td>\n";
+         #   if ($selectedServer && !$serverCmd) showServerStatus($selectedServer);
+        #  echo "</td>\n";
+        #echo "</tr>\n";
+      #echo "</table>\n";
+ 
+            
+     # echo "</td>\n";
+    #echo "</tr>\n";
+  echo "</table>\n";
 
 menu_end();