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 @@ - - +
> @@ -161,9 +161,7 @@ if (isAIX()) { $aixDisabled = 'disabled'; }
- - - +
+ + @@ -36,8 +51,16 @@ if (!$TOPDIR) $TOPDIR = '.'; \n"; } -if ($javascript) { echo "\n"; } +if ($stylesheets) { + foreach ($stylesheets as $s) { + echo "\n"; + } + } +if ($javascripts) { + foreach ($javascripts as $j) { + echo "\n"; + } + } ?> @@ -50,16 +73,17 @@ if ($javascript) { echo " -'; +} //end insertNav ?> -
- - 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'; } ?> - -
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; }