-
- |
+
+ |
-| >
+ | | >
 id=> |
|
@@ -255,15 +209,64 @@ $plusgif = "$TOPDIR/images/plus-sign.gif";
foreach ($list as $key => $link) {
if ($key == $currentLink){
- echo " | |
\n";
+ echo "|
\n";
}else{
- echo "|
\n";
+ echo "|
\n";
}
}
?>
- 1, NoRedirectStderr => 1 }
+ Return status: 0 - successful, error - 1
+------------------------------------------------------------------------------------------------*/
+function runcmd ($cmd, $mode, &$output, $options=NULL){
+
+ //Set error output to the same source as standard output (on Linux)
+ if (strstr($cmd,'2>&1') == FALSE && !$options["NoRedirectStdErr"])
+ $cmd .= ' 2>&1';
+
+ $ret_stat = "";
+ $arr_output = NULL;
+ if ($mode == 3){
+ $handle = popen($cmd, "r");
+ if($handle){
+ $output = $handle; //return file handle to caller
+ return 0; //successful
+ }else{
+ echo "Piping command into a file failed";
+ return 1;
+ }
+ }elseif ($mode == 0 || $mode == 2 ){
+ exec($cmd,$arr_output,$ret_stat);
+ if ($ret_stat == 0){
+ $output = $arr_output;
+ } else {
+ //output the error msg to the screen
+ if ($mode == 0) echo $arr_output[0];
+ //output error msg to the caller function
+ elseif ($mode == 2) $output = $arr_output[0];
+ }
+ }elseif ($mode == 1 || $mode == -1){
+ system($cmd,$ret_stat);
+ }
+ return $ret_stat;
+}
// Send the keys and values in the primary global arrays
diff --git a/xCAT-web/menu.css b/xCAT-web/menu.css
index 04bea8107..52f7e98a4 100644
--- a/xCAT-web/menu.css
+++ b/xCAT-web/menu.css
@@ -1,8 +1,9 @@
/*
+Styles for the navigation area and some other general styles.
+Some of this came from:
template: Artificial Intelligence
author: luka cvrk (www.solucija.com)
-
*/
body {
@@ -14,10 +15,9 @@ body {
color: #333;
}
-.middle{
- font: normal 1em Tahoma, Verdana, Arial, Helvetica, Sans-Serif;
-}
+.middle{ font: normal 1em Tahoma, Verdana, Arial, Helvetica, Sans-Serif; }
+/* this overlaps the BlueBack class in style.css */
.BlueBack{
font: bold .9em Tahoma, Verdana, Arial, Helvetica, Sans-Serif;
color:#003399;
@@ -39,26 +39,106 @@ h3 { clear: both; font-size: 1.1em; color: #000; background: #fff url(images/h3b
.image { float: left; border: 2px solid #e2e2e2; padding: 3px; margin: 0 15px 10px 0; }
.no-border {border:0;}
-/* CONTENT WRAPPER */
-
-#main {
- width: 900px;
- margin: 25px auto 0 auto;
+.inner_table{
+ /*border-collapse:collapse;*/
+ border: 3px;
+ /* background-color: green; */
+ margin-left : 15px;
+ margin-right : 0px;
+ margin-top : 0px;
}
-/* TOP LEFT LOGO */
+td.BorderMe { border:1px dotted #CCC; }
-#logo {
+tr.indent td { padding:0px 0 0px 10px; }
+
+.none { display:none; }
+
+
+/* LEFT VERTICAL MENU/Navigation area */
+
+#menu_level1 {
float: left;
+ color: #3F5B7F;
+ background: #C2CEDE;
+ font-weight: bold;
+ font-size:12px;
+ width: 100%;
+ height:100%;
+ padding: 0px 5px 0px 0px;
}
+ /* menu_level1 rows are not links or lists, they are collapseable sections...
+ #menu_level1 li { list-style: none; }
+ #menu_level1 a:link,a:visited {
+ display: block;
+ color: #3F5B7F; font-weight: bold; background: #C2CEDE; width: 100%; height:100%; padding: 0px; font-weight: bold;
+ text-decoration: none;
+ }
+ #menu_level1 a:hover { background: #9EB1C9 ; color: #fff; text-decoration: underline; }
+ */
+
+#menu_level2 {
+ float: left;
+ color: #3F5B7F;
+ font-weight: bold;
+ background: #BDBDBD ;
+ font-size: 11px;
+ padding: 0px 5px 0px 3px;
+ border-bottom: 1px solid #fff;
+}
+ /* menu_level2 rows are not links or lists, they are collapseable sections...
+ #menu_level2 li { list-style: none; }
+ #menu_level2 a:link, a:visited {
+ display: block;
+ color: #3F5B7F; font-weight: bold; background: #BDBDBD;
+ width: 100%;
+ height:100%;
+ padding: 0px 5px 0px 15px;
+ text-decoration: none;
+ }
+ #menu_level2 a img { border: 0 none; }
+ #menu_level2 a:hover { background: #999999; color: #fff; }
+ #menu_level2 a.current { background: #999999; color: #fff; }
+ #menu_level2.no-link { }
+ */
+
+#menu_level3 {
+ float: left;
+ color: #3F5B7F;
+ font-weight: bold;
+ background: #CCCCCC ;
+ border-bottom: 1px solid #fff;
+ font-size:11px;
+ padding: 0px 5px 0px 15px;
+ width: 100%;
+}
+ /* #menu_level3 li { list-style: none; } */
+ #menu_level3 a:link, a:visited {
+ display: block;
+ /* color: #3F5B7F; width: 110px; font-weight: bold; background: #CCCCCC; */
+ height:100%;
+ text-decoration: none;
+ }
+ #menu_level3 a img { border: 0 none; }
+ #menu_level3 a:hover { background: #999999; color: #fff; }
+ /* #menu_level3 a.current { background: #999999; color: #fff; } */
+ #menu_level3.current { background: #FFFFFF ; }
+
+/* CONTENT WRAPPER */
+/* #main { width: 900px; margin: 25px auto 0 auto; } */
+
+/* TOP LEFT LOGO - not used...
+#logo { float: left; }
#logo h1 { color: #FFFFFF; background: inherit;}
#logo h3 { color: #999999; background: inherit;}
+*/
-/* TOP RIGHT HORIZONTAL MENU */
+/* .main_table { border-collapse:collapse; } */
+/* TOP RIGHT HORIZONTAL MENU - not used...
#menu {
float: right;
- /*background: #fff url(images/barul.gif) no-repeat bottom right; */
+ /*background: #fff url(images/barul.gif) no-repeat bottom right; *//*
color: #808080;
padding: 18px 1px 11px 0;
margin: 0;
@@ -66,29 +146,28 @@ h3 { clear: both; font-size: 1.1em; color: #000; background: #fff url(images/h3b
#menu li {
padding: 14px 18px 14px 18px;
color: #444;
- /*background: #fff url(images/bar.gif) no-repeat bottom left; */
+ /*background: #fff url(images/bar.gif) no-repeat bottom left; *//*
display: inline;
}
#menu li.active {
- /*background: #fff url(images/baractive.gif) no-repeat bottom left; */
+ /*background: #fff url(images/baractive.gif) no-repeat bottom left; *//*
color: #FFFF00;
font-weight: bold;
padding: 14px 18px 14px 18px;
margin: 0 1px 0 0;
}
#menu li a {
- /*background: #f8f8f8; */
+ /*background: #f8f8f8; *//*
color: #808080;
text-decoration: none; font: bold 2em "Trebuchet MS", Helvetica, Sans-Serif; margin: 0; color: #fff; background-color:transparent;
}
#menu li a:hover {
color: #000;
- /*background: #f8f8f8; */
+ /*background: #f8f8f8; *//*
}
.key { text-decoration: underline; } /* ACCESKEY UNDERLINED LETTER */
-/* LEFT INTRO SIDE */
-
+/* LEFT INTRO SIDE - not used
#intro_left {
clear: left;
float: left;
@@ -99,90 +178,9 @@ h3 { clear: both; font-size: 1.1em; color: #000; background: #fff url(images/h3b
}
#intro_left a { color: #fff; background: inherit; }
#intro_left p { padding: 14px 15px; margin: 0; }
+*/
-/* LEFT VERTICAL MENU */
-
-#menu_level1 {
- float: left;
- color: #3F5B7F;
- background: #C2CEDE;
- font-weight: bold;
- font-size:12px;
- width: 100%;
- height:100%;
- padding: 0px;
-}
- #menu_level1 li { list-style: none; }
- #menu_level1 a:link,a:visited {
- display: block;
- color: #3F5B7F;
- font-weight: bold;
- background: #C2CEDE;
- width: 100%;
- height:100%;
- padding: 0px;
- font-weight: bold;
- text-decoration: none;
- }
- #menu_level1 a:hover { background: #9EB1C9 ; color: #fff; text-decoration: underline; }
-
-#menu_level2 {
-float: left;
-color: #3F5B7F;
-font-weight: bold;
-background: #BDBDBD ;
-font-size:11px;
-border-bottom: 1px solid #fff;
-width: 110px;
-}
- #menu_level2 li { list-style: none; }
- #menu_level2 a:link, a:visited {
- display: block;
- color: #3F5B7F;
- width: 110px;
- height:100%;
- padding: 0px 0px 0px 15px;
- font-weight: bold;
- background: #BDBDBD ;
- text-decoration: none;
-
- }
- #menu_level2 a img { border: 0 none; }
- #menu_level2 a:hover { background: #999999; color: #fff; }
- #menu_level2 a.current { background: #999999; color: #fff; }
- #menu_level2.no-link { padding: 0px 0px 0px 3px; }
-
-#menu_level3 {
-float: left;
-/*color: #FFFF00;*/
-color: #3F5B7F;
-font-weight: bold;
-background: #CCCCCC ;
-border-bottom: 1px solid #fff;
-font-size:11px;
-width: 100%;
-}
- #menu_level3 li { list-style: none; }
- #menu_level3 a:link, a:visited {
- display: block;
- color: #3F5B7F;
- width: 110px;
- height:100%;
- padding: 0px 0px 0px 15px;
- background: #CCCCCC ;
- /*margin: 0;*/
- font-weight: bold;
- text-decoration: none;
-
- }
- #menu_level3 a img { border: 0 none; }
- #menu_level3 a:hover { background: #999999; color: #fff; }
- #menu_level3 a.current { background: #999999; color: #fff; }
- #menu_level3.current {padding: 0px 0px 0px 15px; background: #FFFFFF ; }
-
-
-/* RIGHT INTRO SIDE */
-
+/* RIGHT INTRO SIDE - not used...
#intro_right {
float: right;
width: 340px;
@@ -195,9 +193,9 @@ width: 100%;
}
#intro_right h1 { margin: 0 0 20px 0; }
#intro_right .white { color: #FFF; background-color:transparent; }
+*/
-/* LEFT SIDE */
-
+/* LEFT SIDE - not used...
#left {
float: left;
width: 250px;
@@ -214,9 +212,9 @@ width: 100%;
background: #FFFFAD url(images/package.gif) no-repeat;
color: #585616;
}
+*/
-/* RIGHT SIDE */
-
+/* RIGHT SIDE - not used...
#right {
float: right;
width: 643px;
@@ -244,32 +242,8 @@ width: 100%;
background: #eee;
color: #444;
}
+*/
-/* FOOTER */
-
+/* FOOTER - not used...
#footer { clear: both; padding: 5px; border-top: 1px solid #ccc; }
-
-.main_table{
- border-collapse:collapse;
-}
-
-.inner_table{
- /*border-collapse:collapse;*/
- border: 3px;
- /* background-color: green; */
- margin-left : 15px;
- margin-right : 0px;
- margin-top : 0px;
-}
-
-td.BorderMe{
- border:1px dotted #CCC;
-}
-
-tr.indent td{
- padding:0px 0 0px 10px;
-}
-
-.none{
- display:none;
-}
+*/
diff --git a/xCAT-web/old-globalconfig.php b/xCAT-web/old-globalconfig.php
deleted file mode 100644
index 89b590f06..000000000
--- a/xCAT-web/old-globalconfig.php
+++ /dev/null
@@ -1,32 +0,0 @@
-setValue("settingName", "settingValue");
-
-$config = &Config::getInstance();
-$config->setValue("XCATROOT", $XCATROOT);
-$config->setValue("TOPDIR", $TOPDIR);
-$config->setValue("CURRDIR", $CURRDIR);
-$config->setValue("IMAGEDIR", $IMAGEDIR);
-?>
diff --git a/xCAT-web/old-nav.php b/xCAT-web/old-nav.php
deleted file mode 100644
index d63886014..000000000
--- a/xCAT-web/old-nav.php
+++ /dev/null
@@ -1,83 +0,0 @@
-';
-
-//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
-?>
- |
-
-
- |
-
- 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 ' | ';
-
-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 ' ';
-} //end insertNav
-?>
-
-
diff --git a/xCAT-web/style.css b/xCAT-web/style.css
index 2f4627c64..22a28e76a 100644
--- a/xCAT-web/style.css
+++ b/xCAT-web/style.css
@@ -12,16 +12,18 @@ div#content {
top: 95px;
}
+/* not used...
P#logo {
- background-color: #d8dff1; /* #f5f3cf #fffdb0 */
+ background-color: #d8dff1; #f5f3cf #fffdb0
vertical-align : middle;;
padding-top: 5px;
text-align: center;
padding-bottom: 5px;
margin-bottom: 10px;
}
+*/
-p#Banner {
+#banner {
font-weight: bolder;
font-size: 20pt;
font-style: italic;
@@ -30,6 +32,13 @@ p#Banner {
margin: 10px;
}
+#disclaimer {
+ font-weight: bold;
+ font-size: 9pt;
+ color: red;
+ text-align: center;
+}
+
.PageHeading {
background-color: #c0c0c0;
margin-top: 5px;
@@ -61,6 +70,8 @@ p#Banner {
.Font8 {font-size : 8pt;}
.Boxed { border: 1px solid gray; }
.NoMargin { margin: 0px; }
+.Hidden { visibility : hidden ;}
+
.but{
background-color : #fbf999;
@@ -92,19 +103,9 @@ BODY {font-size : 10pt; font-family : Arial;
}
/* The rest of the styles are for the navigation area */
-#foo {
- margin-left : 0px;
- margin-right : 0px;
- margin-top : 0px;
- margin-bottom : 0px;
- padding-top : 0px;
- padding-left : 0px;
- padding-right : 0px;
- padding-bottom : 0px;
- }
table#navtable {
- width: 105px;
+ /* width: 105px; */
font-size : 8pt;
padding-left : 1px;
border: 0px;
@@ -153,7 +154,6 @@ table#navtable {
white-space: nowrap;
}
-.Hidden { visibility : hidden ;}
/* OuterTable is not currently used */
.OuterTable{
|
Settings 
MS Software![](<?php echo "$TOPDIR/images/h3bg_new.gif" ?>)
Settings![](". $TOPDIR . "/images/h3bg_new.gif)
$link[1]
$link[1]