From f23f876f6a4932db817698ade79af7d2b65927ae Mon Sep 17 00:00:00 2001
From: bp-sawyers <bp-sawyers@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 30 Oct 2007 13:05:36 +0000
Subject: [PATCH] Cleaned up after moving to sourceforge

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@18 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-web/dsh.php                              |  20 ++-
 xCAT-web/functions.js                         |   2 +
 xCAT-web/functions.php                        | 131 ++++++++++++++++--
 xCAT-web/index.php                            |   2 +-
 xCAT-web/lib/XCAT/HTML/HTMLProducer.class.php |  22 ++-
 .../XCATCommand/XCATCommandRunner.class.php   |  17 ++-
 .../XCAT/XCATNode/XCATNodeGroupUtil.class.php |   5 +-
 xCAT-web/lib/config.php                       |   2 +
 xCAT-web/menu.css                             |   2 +-
 ...{globalconfig.php => old-globalconfig.php} |   5 +-
 xCAT-web/{nav.php => old-nav.php}             |  55 ++++----
 xCAT-web/prefs.php                            |  10 +-
 xCAT-web/style.css                            |   8 +-
 13 files changed, 192 insertions(+), 89 deletions(-)
 rename xCAT-web/{globalconfig.php => old-globalconfig.php} (86%)
 rename xCAT-web/{nav.php => old-nav.php} (70%)

diff --git a/xCAT-web/dsh.php b/xCAT-web/dsh.php
index 307db36f9..18a1649f2 100644
--- a/xCAT-web/dsh.php
+++ b/xCAT-web/dsh.php
@@ -1,22 +1,22 @@
 <?php
 /*------------------------------------------------------------------------------
-  Include files, insert header and menu bar
+  Produce the page for running commands on the nodes of the cluster
 ------------------------------------------------------------------------------*/
 $expire_time = gmmktime(0, 0, 0, 1, 1, 2038);
 setcookie("history", "date;hello.sh", $expire_time);
 
-require_once("globalconfig.php");
+//require_once("globalconfig.php");
 require_once("XCAT/XCATCommand/XCATCommandRunner.class.php");
 
-require_once "$TOPDIR/functions.php";	//NOTE: it is essential to include this file before include top.php and nav.php
-require_once "$TOPDIR/nav.php";
+require_once "$TOPDIR/functions.php";
+//require_once "$TOPDIR/nav.php";
 
-insertHeader('Run commands on xCAT nodes', $TOPDIR, '', '');
-insertNav('dsh', $TOPDIR);
+insertHeader('Run commands on xCAT nodes', array('themes/default.css'),
+			array('javascripts/prototype.js', 'javascripts/effect.js', 'javascripts/window.js'));
+insertNav('dsh');
 if (isAIX()) { $aixDisabled = 'disabled'; }
 ?>
-</td>
-<td width="796" class="BorderMe" valign="top" align="left">
+<div id=content>
 <FORM NAME="dsh_options" onsubmit="checkEmpty();">
 <input type="hidden" id="nodename" value=<?php echo @$_REQUEST["node"] ?> >
 <TABLE class="inner_table" cellspacing=0 cellpadding=5>
@@ -161,9 +161,7 @@ if (isAIX()) { $aixDisabled = 'disabled'; }
   </TBODY>
 </TABLE>
 </FORM>
-</TD>
-</TR>
-</TABLE>
+<div>
 <script type="text/javascript" src="js_xcat/event.js"> </script>
 <script type="text/javascript" src="js_xcat/ui.js"> </script>
 <SCRIPT language="JavaScript">
diff --git a/xCAT-web/functions.js b/xCAT-web/functions.js
index d77f83f65..78e3fbd2d 100644
--- a/xCAT-web/functions.js
+++ b/xCAT-web/functions.js
@@ -1,3 +1,5 @@
+// Javascript functions that most pages need.
+// Note: this is included by all pages, so only put functions in this file that most/all pages need.
 
 function setCookies(form)
 {
diff --git a/xCAT-web/functions.php b/xCAT-web/functions.php
index 4f009f3f3..b4275e93e 100644
--- a/xCAT-web/functions.php
+++ b/xCAT-web/functions.php
@@ -2,11 +2,23 @@
 
 // Contains all the common php functions that most pages need.
 
+// Some common/global settings
+session_start();     // retain session variables across page requests
+
+// The settings below display error on the screen, instead of giving blank pages.
+error_reporting(E_ALL ^ E_NOTICE);
+ini_set('display_errors', true);
+
+// Todo: get rid of these globals
+$XCATROOT = '/opt/xcat/bin';
+$CURRDIR = '/opt/xcat/web';
+
 
 /*-----------------------------------------------------------------------------------------------
 	Function to insert the header part of the HTML and the top part of the page
 ------------------------------------------------------------------------------------------------*/
-function insertHeader($title, $TOPDIR, $stylesheet, $javascript) {
+function insertHeader($title, $stylesheets, $javascripts) {
+global $TOPDIR;
 if (!$TOPDIR) 	$TOPDIR = '.';
 ?>
 
@@ -18,13 +30,16 @@ if (!$TOPDIR) 	$TOPDIR = '.';
 <link rel="stylesheet" href="style.css">
 <link rel="stylesheet" href="menu.css">
 <script type="text/javascript" src="functions.js"></script>
+
 <script type="text/javascript" src="js_xcat/event.js"> </script>
 <script type="text/javascript" src="js_xcat/ui.js"> </script>
 
+<!-- These are only needed for popup windows, so only need it for specific pages like dsh
 <script type="text/javascript" src="javascripts/prototype.js"> </script>
 <script type="text/javascript" src="javascripts/effect.js"> </script>
 <script type="text/javascript" src="javascripts/window.js"> </script>
 <link href="themes/default.css" rel="stylesheet" type="text/css"/>
+-->
 
 <link rel="stylesheet" href="css/xcattop.css">
 <link rel="stylesheet" href="css/xcat.css">
@@ -36,8 +51,16 @@ if (!$TOPDIR) 	$TOPDIR = '.';
 <script src="js/xcat.js" type="text/javascript"></script>
 
 <?php
-if ($stylesheet) { echo "<LINK rel=stylesheet href='$stylesheet' type='text/css'>\n"; }
-if ($javascript) { echo "<script type='text/javascript' src='$javascript'></script>\n"; }
+if ($stylesheets) {
+	foreach ($stylesheets as $s) {
+		echo "<LINK rel=stylesheet href='$s' type='text/css'>\n";
+		}
+	}
+if ($javascripts) {
+	foreach ($javascripts as $j) {
+		echo "<script type='text/javascript' src='$j'></script>\n";
+		}
+	}
 ?>
 </head>
 <body>
@@ -50,16 +73,17 @@ if ($javascript) { echo "<script type='text/javascript' src='$javascript'></scri
 <?php }  // end insertHeader
 
 
+// A few constants
+/*
 require_once("lib/config.php");
 $config = &Config::getInstance();
 $imagedir = $config->getValue("IMAGEDIR");
-
-// A few constants
 $colTxt = "Click to collapse section";
 $exTxt = "Click to expand section";
 $bulgif = "$imagedir/h3bg_new.gif";
 $minusgif = "$imagedir/minus-sign.gif";
 $plusgif = "$imagedir/plus-sign.gif";
+*/
 
 
 /** ----------------------------------------------------------------------------------------------
@@ -109,9 +133,86 @@ function runcmd ($cmd, $mode, &$output, $options=NULL){
 	}
 	return $ret_stat;
 }
+
+
+/*------------------------------------------------------------------------------
+   Create the navigation area on the left.
+   $currentlink is the key of the link to the page
+   that is currently being displayed.
+------------------------------------------------------------------------------*/
+
+function insertNav($currentLink) {
+// A few constants
+global $TOPDIR;    // or could use $GLOBALS['TOPDIR']
+$colTxt = "Click to collapse section";
+$exTxt = "Click to expand section";
+$bulgif = "$TOPDIR/images/h3bg_new.gif";
+$minusgif = "$TOPDIR/images/minus-sign.gif";
+$plusgif = "$TOPDIR/images/plus-sign.gif";
+
+echo '<div id=nav><table border="0" cellpadding="0" cellspacing="1" width="110">';
+
+//Console section
+insertInner('open', 1,'Console', 'constab', $currentLink, array(
+	'prefs' => array("$TOPDIR/prefs.php", 'Preferences'),
+	'updategui' => array("$TOPDIR/softmaint/updategui.php", 'Update'),
+	'suggestions' => array("$TOPDIR/suggestions.html", 'Suggestions'),
+	'logout' => array("$TOPDIR/logout.php", 'Logout')
+));
+
+// xCAT Cluster section
 ?>
+ <TR><TD id="menu_level1" width="110">
+ <P title="<?php echo $colTxt; ?>" onclick="toggleSection(this,'clustab')" ondblclick="toggleSection(this,'clustab')">
+ <IMG src=<?php echo $minusgif ?> id='clustab-im'> xCAT Cluster
+ </P></TD></TR>
+ <TR><TD>
+  <TABLE id='clustab' cellpadding=0 cellspacing=0 width="110"><TBODY>
+    <TR><TD id="menu_level2"><A href="csmconfig">Settings</A></TD></TR>
 
 <?php
+	insertInner('open', 2,'Installation', 'installtab', $currentLink, array(
+		'softmaint' => array("$TOPDIR/softmaint", 'MS Software'),
+		'addnodes' => array("$TOPDIR/addnodes.php", 'Add Nodes'),
+		'definenode' => array("$TOPDIR/definenode.php", 'Define Nodes'),
+		'hwctrl' => array("$TOPDIR/hwctrl/index.php", 'HW Control')
+	));
+	insertInner('open', 2,'Administration', 'admintab', $currentLink, array(
+		'nodes' => array("$TOPDIR/index.php", 'Nodes'),
+		'layout' => array("$TOPDIR/hwctrl/layout.php", 'Layout'),
+		'dsh' => array("$TOPDIR/dsh.php", 'Run Cmds'),
+		'dcp' => array("$TOPDIR/dcp.php", 'Copy Files'),
+		'cfm' => array("$TOPDIR/cfm.php", 'Sync Files'),
+		'shell' => array("$TOPDIR/shell.php", 'Cmd on MS'),
+		'import' => array("$TOPDIR/import.php", 'Import/Export'),
+	));
+	insertInner('open', 2,'Monitor', 'montab', $currentLink, array(
+		'conditions' => array("$TOPDIR/mon", 'Conditions'),
+		'responses' => array("$TOPDIR/mon/resp.php", 'Responses'),
+		'sensors' => array("$TOPDIR/mon/sensor.php", 'Sensors'),
+		'rmcclass' => array("$TOPDIR/mon/rmcclass.php", 'RMC Classes'),
+		'auditlog' => array("$TOPDIR/mon/auditlog.php", 'Event Log'),
+		'perfmon' => array("$TOPDIR/perfmon/index.php", 'Performance'),
+
+	));
+	insertInner('open', 2,'Diagnostics', 'diagtab', $currentLink, array(
+		'diagms' => array("$TOPDIR/diagms", 'MS Diags'),
+	));
+
+  echo '</TABLE></TD></TR>';
+
+insertInner('open', 1,'Documentation', 'doctab', $currentLink, array(
+	'xcatdocs' => array(getDocURL('web','docs'), 'xCAT Docs'),
+	'forum' => array(getDocURL('web','forum'), 'Mailing List'),
+	'codeupdates' => array(getDocURL('web','updates'), 'Code Updates'),
+	'opensrc' => array(getDocURL('web','opensrc'), 'Open Src Reqs'),
+	'wiki' => array(getDocURL('web','wiki'), 'xCAT Wiki'),
+));
+
+echo '</table></div>';
+}  //end insertNav
+
+
 /**--------------------------------------------------------------
 	Insert one inner table in the nav area function above.
 	Type is the type of the menu item, i.e: close or open (plus sign/minus sign)
@@ -120,13 +221,15 @@ function runcmd ($cmd, $mode, &$output, $options=NULL){
 	CurrentLink is the key of the link for the current page.
 	List is a keyed array of href, label pairs.
 ----------------------------------------------------------------*/
-function insertInner($type,$level,$title, $id, $currentLink, $TOPDIR, $list) {
-	// A few constants
-	global $imagedir;
-	global $colTxt;
-	global $bulgif;
-	global $minusgif;
-	global $plusgif;
+function insertInner($type,$level,$title, $id, $currentLink, $list) {
+// A few constants
+global $TOPDIR;    // or could use $GLOBALS['TOPDIR']
+$colTxt = "Click to collapse section";
+$exTxt = "Click to expand section";
+$bulgif = "$TOPDIR/images/h3bg_new.gif";
+$minusgif = "$TOPDIR/images/minus-sign.gif";
+$plusgif = "$TOPDIR/images/plus-sign.gif";
+
 	switch($level){
 		case 1: $menu_level = "menu_level1"; break;
 		case 2: $menu_level = "menu_level2"; break;
@@ -134,14 +237,16 @@ function insertInner($type,$level,$title, $id, $currentLink, $TOPDIR, $list) {
 	}
 	if ($type == "open"){
 		$gif = $minusgif;
+		$hoverTxt = $colTxt;
 		$style = "display:inline";
 	}else {
 		$gif = $plusgif;
+		$hoverTxt = $exTxt;
 		$style = "display:none";
 	}
 ?>
 <TR><TD id=<?php echo $menu_level; if($level == 2) echo " class=no-link"; ?>>
-<P title=<?php echo $colTxt; ?> onclick="toggleSection(this,'<?php echo $id ?>')" ondblclick="toggleSection(this,'<?php echo $id ?>')">
+<P title="<?php echo $hoverTxt; ?>" onclick="toggleSection(this,'<?php echo $id ?>')" ondblclick="toggleSection(this,'<?php echo $id ?>')">
 <IMG src=<?php echo $gif; ?> id=<?php echo $id."-im" ?>> <?php echo $title ?></P></TD></TR>
 <TR><TD >
 <TABLE id=<?php echo $id ?> width="100%" cellpadding="0" cellspacing="0" border=0 style=<?php echo $style ?>>
diff --git a/xCAT-web/index.php b/xCAT-web/index.php
index 98a45ca24..46890a23c 100644
--- a/xCAT-web/index.php
+++ b/xCAT-web/index.php
@@ -4,7 +4,7 @@
 
 $TOPDIR = '.';
 require_once "$TOPDIR/functions.php";
-require_once "$TOPDIR/nav.php";
+//require_once "$TOPDIR/nav.php";
 
 //require_once("globalconfig.php");
 require_once("lib/XCAT/HTML/HTMLProducer.class.php");
diff --git a/xCAT-web/lib/XCAT/HTML/HTMLProducer.class.php b/xCAT-web/lib/XCAT/HTML/HTMLProducer.class.php
index ba198cc54..283e3a143 100644
--- a/xCAT-web/lib/XCAT/HTML/HTMLProducer.class.php
+++ b/xCAT-web/lib/XCAT/HTML/HTMLProducer.class.php
@@ -2,7 +2,7 @@
 /**
  * Produces HTML for use in the interface.
  */
-require_once("config.php");
+//require_once("config.php");
 
 class HTMLProducer {
 
@@ -45,11 +45,12 @@ EOS;
  * @param String nodeGroupName		The name of the node group.
  */
 function getToggleString($nodeGroupName) {
-	global $imagedir;
-	global $colTxt, $exTxt;
-	global $bulgif;
-	global $minusgif;
-	global $plusgif;
+$colTxt = "Click to collapse section";
+$exTxt = "Click to expand section";
+$bulgif = "$TOPDIR/images/h3bg_new.gif";
+$minusgif = "$TOPDIR/images/minus-sign.gif";
+$plusgif = "$TOPDIR/images/plus-sign.gif";
+
 	$html = <<<EOS
 <span
 	title="Click to expand section"
@@ -67,8 +68,7 @@ EOS;
  */
 function getXCATGroupTableRow($nodeGroup) {
 
-$config = &Config::getInstance();
-$imagedir = $config->getValue("IMAGEDIR");
+$imagedir = 'images';
 $nodeGroupName = $nodeGroup->getName();
 $img_string = XCATNodeGroupUtil::getImageString($nodeGroup->getStatus());
 
@@ -97,8 +97,7 @@ EOE;
 	 * returns the table that contains all the nodes information of that group
 	 */
 function getXCATNodeGroupSection($nodeGroup) {
-		$config = &Config::getInstance();
-		$imagedir = $config->getValue("IMAGEDIR");
+		$imagedir = 'images';
 		$right_arrow_gif = $imagedir . "/grey_arrow_r.gif";
 		$left_arrow_gif = $imagedir . "/grey_arrow_l.gif";
 
@@ -129,8 +128,7 @@ EOS;
 	 */
 function getXCATNodeTableRow($node) {
 
-		$config = &Config::getInstance();
-		$imagedir = $config->getValue("IMAGEDIR");
+		$imagedir = 'images';
 
 		//echo $node->getName();
 		$html = "<tr bgcolor=\"#FFFF66\" class=\"indent\">
diff --git a/xCAT-web/lib/XCAT/XCATCommand/XCATCommandRunner.class.php b/xCAT-web/lib/XCAT/XCATCommand/XCATCommandRunner.class.php
index 30fd60a6b..9b20cd077 100644
--- a/xCAT-web/lib/XCAT/XCATCommand/XCATCommandRunner.class.php
+++ b/xCAT-web/lib/XCAT/XCATCommand/XCATCommandRunner.class.php
@@ -1,10 +1,10 @@
 <?php
-require_once("config.php");
-require_once("XCAT/XCATNode/XCATNodeGroupUtil.class.php");
-require_once("XCAT/XCATNode/XCATNode.class.php");
-require_once("XCAT/XCATNode/XCATNodeManager.class.php");
-require_once("XCAT/XCATNodeGroup/XCATNodeGroup.class.php");
-require_once("XCAT/XCATNodeGroup/XCATNodeGroupManager.class.php");
+//require_once("config.php");
+require_once("lib/XCAT/XCATNode/XCATNodeGroupUtil.class.php");
+require_once("lib/XCAT/XCATNode/XCATNode.class.php");
+require_once("lib/XCAT/XCATNode/XCATNodeManager.class.php");
+require_once("lib/XCAT/XCATNodeGroup/XCATNodeGroup.class.php");
+require_once("lib/XCAT/XCATNodeGroup/XCATNodeGroupManager.class.php");
 
 class XCATCommandRunner {
 	var $XCATRoot;
@@ -14,9 +14,8 @@ class XCATCommandRunner {
 	var $XCATNodeGroupManager;
 
 	function XCATCommandRunner() {
-		$config = &Config::getInstance();
-		$this->XCATRoot = $config->getValue("XCATROOT");
-		$this->CurrDir = $config->getValue("CURRDIR");
+		$this->XCATRoot = '/opt/xcat/bin';   //todo: get rid of these
+		$this->CurrDir = '/opt/xcat/web';
 
 		$this->XCATNodeManager = &XCATNodeManager::getInstance();
 		$this->XCATNodeGroupManager = &XCATNodeGroupManager::getInstance();
diff --git a/xCAT-web/lib/XCAT/XCATNode/XCATNodeGroupUtil.class.php b/xCAT-web/lib/XCAT/XCATNode/XCATNodeGroupUtil.class.php
index 958645722..2f07cf2c5 100644
--- a/xCAT-web/lib/XCAT/XCATNode/XCATNodeGroupUtil.class.php
+++ b/xCAT-web/lib/XCAT/XCATNode/XCATNodeGroupUtil.class.php
@@ -1,5 +1,5 @@
 <?php
-require_once("config.php");
+//require_once("config.php");
 
 /**
  * Contains some utilities for XCATNodes.
@@ -35,8 +35,7 @@ class XCATNodeGroupUtil {
 	 * Return the image string based on the node/group status
 	 */
 	function getImageString($status){
-			$config = &Config::getInstance();
-			$imagedir = $config->getValue("IMAGEDIR");
+			$imagedir = 'images';
 			$greengif = $imagedir . "/green-ball-m.gif";
 			$yellowgif = $imagedir . "/yellow-ball-m.gif";
 			$redgif = $imagedir . "/red-ball-m.gif";
diff --git a/xCAT-web/lib/config.php b/xCAT-web/lib/config.php
index 8fec80221..b670b9a0c 100644
--- a/xCAT-web/lib/config.php
+++ b/xCAT-web/lib/config.php
@@ -1,4 +1,6 @@
 <?php
+//Note: this file is not used any more
+
 class Config {
 	var $configMap;
 
diff --git a/xCAT-web/menu.css b/xCAT-web/menu.css
index fbfe310f7..04bea8107 100644
--- a/xCAT-web/menu.css
+++ b/xCAT-web/menu.css
@@ -256,7 +256,7 @@ width: 100%;
 .inner_table{
 	/*border-collapse:collapse;*/
 	border: 3px;
-	background-color:green;
+	/* background-color: green; */
 	margin-left : 15px;
   margin-right : 0px;
   margin-top : 0px;
diff --git a/xCAT-web/globalconfig.php b/xCAT-web/old-globalconfig.php
similarity index 86%
rename from xCAT-web/globalconfig.php
rename to xCAT-web/old-globalconfig.php
index bf18fd2c7..89b590f06 100644
--- a/xCAT-web/globalconfig.php
+++ b/xCAT-web/old-globalconfig.php
@@ -1,6 +1,7 @@
 <?php
 
-//Todo: get rid of the include path
+//Note: this file is not used any more
+
 // Set the include path
 $APP_ROOT = dirname(__FILE__);
 // Switch : to ; on Windows
@@ -16,7 +17,7 @@ require_once("lib/config.php");
 $XCATROOT = getenv("XCATROOT") ? getenv("XCATROOT").'/bin' : '/opt/xcat/bin';
 $SYSTEMROOT = '/bin';
 $TOPDIR = '.';
-$CURRDIR = '/opt/xcat/web';    //Todo: eliminate the need for this
+$CURRDIR = '/opt/xcat/web';
 $IMAGEDIR = "$TOPDIR/images";
 
 // Put any configuration global variables here
diff --git a/xCAT-web/nav.php b/xCAT-web/old-nav.php
similarity index 70%
rename from xCAT-web/nav.php
rename to xCAT-web/old-nav.php
index 093cc1b5f..d63886014 100644
--- a/xCAT-web/nav.php
+++ b/xCAT-web/old-nav.php
@@ -1,52 +1,50 @@
-
 <?php
+
+// This file is no longer used...
+
 /*------------------------------------------------------------------------------
    Create the navigation area on the left.
    $currentlink is the key of the link to the page
    that is currently being displayed.
 ------------------------------------------------------------------------------*/
 
-function insertNav($currentLink, $TOPDIR) {
-	// A few constants
-	global $imagedir;
-	global $colTxt;
-	global $bulgif;
-	global $minusgif;
-	global $plusgif;
-?>
+function insertNav($currentLink) {
+// A few constants
+global $TOPDIR;    // or could use $GLOBALS['TOPDIR']
+$colTxt = "Click to collapse section";
+$exTxt = "Click to expand section";
+$bulgif = "$TOPDIR/images/h3bg_new.gif";
+$minusgif = "$TOPDIR/images/minus-sign.gif";
+$plusgif = "$TOPDIR/images/plus-sign.gif";
 
-<script type="text/javascript" src="functions.js"></script>
-<div id=nav>
-<table border="0" cellpadding="0" cellspacing="1" width="110">
+echo '<div id=nav><table border="0" cellpadding="0" cellspacing="1" width="110">';
 
-<?php
 //Console section
-insertInner('open', 1,'Console', 'constab', $currentLink, $TOPDIR, array(
+insertInner('open', 1,'Console', 'constab', $currentLink, array(
 	'prefs' => array("$TOPDIR/prefs.php", 'Preferences'),
 	'updategui' => array("$TOPDIR/softmaint/updategui.php", 'Update'),
 	'suggestions' => array("$TOPDIR/suggestions.html", 'Suggestions'),
 	'logout' => array("$TOPDIR/logout.php", 'Logout')
 ));
-?>
-<?php
+
 // xCAT Cluster section
 ?>
  <TR><TD id="menu_level1" width="110">
- <P title=<?php echo $colTxt; ?> onclick="toggleSection(this,'clustab')" ondblclick="toggleSection(this,'clustab')">
+ <P title="<?php echo $colTxt; ?>" onclick="toggleSection(this,'clustab')" ondblclick="toggleSection(this,'clustab')">
  <IMG src=<?php echo $minusgif ?> id='clustab-im'> xCAT Cluster
  </P></TD></TR>
  <TR><TD>
   <TABLE id='clustab' cellpadding=0 cellspacing=0 width="110"><TBODY>
     <TR><TD id="menu_level2"><A href="csmconfig">Settings</A></TD></TR>
 
-	<?php
-	insertInner('open', 2,'Installation', 'installtab', $currentLink, $TOPDIR, array(
+<?php
+	insertInner('open', 2,'Installation', 'installtab', $currentLink, array(
 		'softmaint' => array("$TOPDIR/softmaint", 'MS Software'),
 		'addnodes' => array("$TOPDIR/addnodes.php", 'Add Nodes'),
 		'definenode' => array("$TOPDIR/definenode.php", 'Define Nodes'),
 		'hwctrl' => array("$TOPDIR/hwctrl/index.php", 'HW Control')
 	));
-	insertInner('open', 2,'Administration', 'admintab', $currentLink, $TOPDIR, array(
+	insertInner('open', 2,'Administration', 'admintab', $currentLink, array(
 		'nodes' => array("$TOPDIR/index.php", 'Nodes'),
 		'layout' => array("$TOPDIR/hwctrl/layout.php", 'Layout'),
 		'dsh' => array("$TOPDIR/dsh.php", 'Run Cmds'),
@@ -55,7 +53,7 @@ insertInner('open', 1,'Console', 'constab', $currentLink, $TOPDIR, array(
 		'shell' => array("$TOPDIR/shell.php", 'Cmd on MS'),
 		'import' => array("$TOPDIR/import.php", 'Import/Export'),
 	));
-	insertInner('open', 2,'Monitor', 'montab', $currentLink, $TOPDIR, array(
+	insertInner('open', 2,'Monitor', 'montab', $currentLink, array(
 		'conditions' => array("$TOPDIR/mon", 'Conditions'),
 		'responses' => array("$TOPDIR/mon/resp.php", 'Responses'),
 		'sensors' => array("$TOPDIR/mon/sensor.php", 'Sensors'),
@@ -64,25 +62,22 @@ insertInner('open', 1,'Console', 'constab', $currentLink, $TOPDIR, array(
 		'perfmon' => array("$TOPDIR/perfmon/index.php", 'Performance'),
 
 	));
-	insertInner('open', 2,'Diagnostics', 'diagtab', $currentLink, $TOPDIR, array(
+	insertInner('open', 2,'Diagnostics', 'diagtab', $currentLink, array(
 		'diagms' => array("$TOPDIR/diagms", 'MS Diags'),
 	));
-	?>
 
-  </TABLE>
- </TD></TR>
+  echo '</TABLE></TD></TR>';
 
-<?php
-insertInner('open', 1,'Documentation', 'doctab', $currentLink, $TOPDIR, array(
+insertInner('open', 1,'Documentation', 'doctab', $currentLink, array(
 	'xcatdocs' => array(getDocURL('web','docs'), 'xCAT Docs'),
 	'forum' => array(getDocURL('web','forum'), 'Mailing List'),
 	'codeupdates' => array(getDocURL('web','updates'), 'Code Updates'),
 	'opensrc' => array(getDocURL('web','opensrc'), 'Open Src Reqs'),
 	'wiki' => array(getDocURL('web','wiki'), 'xCAT Wiki'),
 ));
+
+echo '</table></div>';
+}  //end insertNav
 ?>
 
-</table></div>
-<?php }//end function ?>
-
 
diff --git a/xCAT-web/prefs.php b/xCAT-web/prefs.php
index 5daa96b24..fca8256f0 100644
--- a/xCAT-web/prefs.php
+++ b/xCAT-web/prefs.php
@@ -3,17 +3,15 @@
   Include files, insert header and menu bar
 ------------------------------------------------------------------------------*/
 
-require_once("globalconfig.php");
+//require_once("globalconfig.php");
 
 require_once "$TOPDIR/functions.php";	//NOTE: it is essential to include this file before include top.php and nav.php
-require_once "$TOPDIR/nav.php";
+//require_once "$TOPDIR/nav.php";
 
-insertHeader('Preferences', $TOPDIR, '', '');
-insertNav('prefs', $TOPDIR);
+insertHeader('Preferences', NULL, NULL);
+insertNav('prefs');
 if (isAIX()) { $aixDisabled = 'disabled'; }
 ?>
-</td>
-<td width="796" class="BorderMe" valign="top" align="left">
 <FORM NAME="prefs">
 <TABLE class="inner_table" cellspacing=0 cellpadding=5>
   <TBODY>
diff --git a/xCAT-web/style.css b/xCAT-web/style.css
index a731c2334..2f4627c64 100644
--- a/xCAT-web/style.css
+++ b/xCAT-web/style.css
@@ -6,7 +6,7 @@ div#nav {
 }
 
 div#content {
-  /* background-color : #fcfaeb; */
+  background-color : #fcfaeb;
   position: absolute;
   left: 125px;
   top: 95px;
@@ -30,6 +30,12 @@ p#Banner {
  margin: 10px;
 }
 
+.PageHeading {
+ background-color: #c0c0c0;
+ margin-top: 5px;
+ margin-bottom: 5px;
+}
+
 /* pre { padding: 0px; margin: 0px; } */
 
 .TableRow { background-color : #d8dff1; }