From 54bd6bed54710d4e06b7750a393e02b61b70872e Mon Sep 17 00:00:00 2001
From: mxi1 <mxi1@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 16 Jul 2009 09:52:29 +0000
Subject: [PATCH] 1) On the mainpage,  the previous "Monitor" is re-named to
 "Syslog"; 2) The new "Monitor" Link is added into the mainpage/main panel; 3)
 The xCAT version displayed at the bottom of web page is updated; 4) $TOPDIR
 variable is added. The reason is that if the file display.php is invoked in
 one sub-directory, there will be php errors.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3810 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-UI/lib/display.php | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/xCAT-UI/lib/display.php b/xCAT-UI/lib/display.php
index 07d9d6b07..66334f9e9 100644
--- a/xCAT-UI/lib/display.php
+++ b/xCAT-UI/lib/display.php
@@ -1,5 +1,6 @@
 <?php
-require_once "lib/security.php";
+if(!isset($TOPDIR)) { $TOPDIR='/opt/xcat/ui';}
+require_once "$TOPDIR/lib/security.php";
 
 function displayHeader() {
 echo <<<EOS1
@@ -94,7 +95,10 @@ echo <<<EOS4
     <a href="provision.php">provision</a>
    </li>
    <li>
-    <a href="monitor.php">monitor</a>
+    <a href="monitor.php">syslog</a>
+   </li>
+   <li>
+    <a href="monitor/monlist.php">monitor</a>
    </li>
   </ul>
   <!-- <div id="cmdForm">
@@ -121,10 +125,12 @@ EOS5;
 }
 
 function displayFooter() {
-echo <<<EOS3
- <div id='bopper'>&nbsp;</div>
- <div id='footer'>xCAT Web v2.2.06242009</div>
-EOS3;
+echo "<div id='bopper'>&nbsp;</div>";
+//<div id='footer'>xCAT Web v2.2.06242009</div>
+# use system() to get the xCAT Web version;
+echo "<div id='footer'>";
+system("rpm -q xCAT-UI");
+echo "</div>";
 # comment out if statement to fix refresh but of logout.
 	if(!isAuthenticated()){
 		insertLogin();
@@ -492,7 +498,15 @@ echo <<<EOS
 <ul>
 	<li>Provision node</li>
 </ul>
-<h1><a href='#' onclick='loadMainPage("monitor.php")'>Monitor</a></h1>
+<h1><a href='#' onclick='loadMainPage("monitor.php")'>Syslog</a></h1>
+<ul>
+    <li>Show syslog Entries</li>
+</ul>
+<h1><a href='#' onclick='loadMainPage("monitor/monlist.php")'>Monitor</a></h1>
+<ul>
+    <li>Monitoring Events/Performances by Monitoring Plugins, such as RMC...</li>
+    <li>This is still <b>UNDER DEVELOPMENT</b>.</li>
+</ul>
 </div>
 EOS;
 }