From fe228e40d10dc44dd6d55fcccf77ca9284035248 Mon Sep 17 00:00:00 2001
From: mxi1 <mxi1@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 13 Oct 2009 11:43:39 +0000
Subject: [PATCH] small update for  monitoring interface.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4367 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-UI/css/main.css                    |  4 +++-
 xCAT-UI/lib/monitor_display.php         | 17 +++++++----------
 xCAT-UI/monitor/rmc_resource_define.php | 10 +++++-----
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/xCAT-UI/css/main.css b/xCAT-UI/css/main.css
index f42c89ced..0df266a2f 100644
--- a/xCAT-UI/css/main.css
+++ b/xCAT-UI/css/main.css
@@ -436,7 +436,7 @@ padding:10px 2px;
 }
 
 #monsetting_tips {
-    width: 888px;
+    width: 920px;
     margin: 5px;
     padding: 5px;
     float: left;
@@ -448,6 +448,8 @@ padding:10px 2px;
     padding: 5px;
     float: left;
     background-color:silver;
+    height: 480px;
+    overflow-y: scroll;
 }
 
 #rmcScrAttr {
diff --git a/xCAT-UI/lib/monitor_display.php b/xCAT-UI/lib/monitor_display.php
index 27a668930..e5b2f1334 100644
--- a/xCAT-UI/lib/monitor_display.php
+++ b/xCAT-UI/lib/monitor_display.php
@@ -415,7 +415,6 @@ function displayRMCMonshowAttr($attr, $nr) {
         $xml = docmd("monshow", "", array("rmcmon", "$nr", "-t", "60", "-a", "$attr"));
     }
     //the formats of the data are different based on $nr
-    //print_r($xml);
     $index = 0;
     foreach($xml->children() as $response) foreach($response->children() as $data) {
         //handle the data here
@@ -426,15 +425,13 @@ function displayRMCMonshowAttr($attr, $nr) {
         //then, parse "date" & "value"
         $arr = preg_split("/\s+/", $data);
         array_pop($arr);
-        $tmp = array_pop($arr);
-        if($tmp == '-') {
-            $val = array_pop($arr);
-            $time = implode(" ", $arr);
-            echo "<tr>";
-            echo "<td>$time</td>";
-            echo "<td>$val</td>";
-            echo "</tr>";
-        }
+        //print_r($arr);
+        $val = array_pop($arr);
+        $time = implode(" ", $arr);
+        echo "<tr>";
+        echo "<td>$time</td>";
+        echo "<td>$val</td>";
+        echo "</tr>";
     }
     echo "</tbody>";
     echo "</table>";
diff --git a/xCAT-UI/monitor/rmc_resource_define.php b/xCAT-UI/monitor/rmc_resource_define.php
index 29341b021..53fb3c24c 100644
--- a/xCAT-UI/monitor/rmc_resource_define.php
+++ b/xCAT-UI/monitor/rmc_resource_define.php
@@ -10,11 +10,11 @@ require_once "$TOPDIR/lib/functions.php";
 require_once "$TOPDIR/lib/display.php";
 require_once "$TOPDIR/lib/monitor_display.php";
 
-displayMapper(array('home'=>'main.php', 'monitor' =>''));
-
-displayTips(array("All the available RMC resources are listed here;",
-    "Edit this table to define the RMC performance monitoring;",
-    "Select the RMC resource, you can get all the available attributes."));
+//displayMapper(array('home'=>'main.php', 'monitor' =>''));
+//
+//displayTips(array("All the available RMC resources are listed here;",
+//    "Edit this table to define the RMC performance monitoring;",
+//    "Select the RMC resource, you can get all the available attributes."));
 
 //displayMonsetting();
 echo "<div id='testme'>";