discoer page layout change

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9425 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd

xCAT-UI/css/style.css

@@ -685,28 +685,23 @@ table a:hover {
 
 /*--------------- Discovery section ---------------*/
 .discoverstep {
-	width: 220px;
+	width: 960px;
 	vertical-align: top;
-	float: left;
-	position: relative;
-	overflow: auto;
 	background-color: #A9D0F5;
-	padding: 5px 0px;
+	padding: 0px 0px 0px 5px;
 	-moz-border-radius: .5em;
 	-webkit-border-radius: .5em;
 	border-radius: .5em;
 }
-
-.discoverstep span {
+.discovercurrentstep{
+	background-color: yellow;
 	font: normal bold 12px/ 35px verdana, arial, helvetica, sans-serif;
 	padding: 5px;
-	margin: 0px 5px; /* Top right left bottom*/
 }
-
 .discovercontent {
-	width: 700px;
+	width: 960px;
 	display: inline-table;
-	padding: 0 0 0 20px;
+	padding: 0;
 }
 
 .discovercontent table{

xCAT-UI/js/configure/discover.js

@@ -1,13 +1,13 @@
 /*associate the step name with step number*/
-var steps = ['Discover hardware', 
-             'Cluster patterns',
-             'Supernode numbers',
-             'More cluster patterns',
+var steps = ['Platform', 
+             'Patterns',
+             'Supernode',
+             'More patterns',
              'Power on hardware',
              'Discover frames',
-             'Prepare management node',
-             'Update definitions',
-             'Create LPARs',
+             'Management node',
+             'Update',
+             'LPARs',
              'Complete'];
 
 /*associate the function with step number*/
@@ -70,10 +70,11 @@ function updateDiscoverStep(){
 	for (var index in steps){
 		showString += '<span';
 		if (currentStep == index){
-			showString += ' style="background-color:yellow;"';
+			showString += ' class="discovercurrentstep"';
 		}
-		showString += '>' + steps[index] + '</span><br/>';
+		showString += '>' + steps[index] + '</span>->';
 	}
+	showString = showString.substr(0, showString.length - 2);
 	$('#discoverStepDiv').html(showString);
 }
 
@@ -899,7 +900,7 @@ function initDiscoverFrames(){
 		return;
 	}
 	
-	statBar.append('Discovering all Frames by lsslp.').append(createLoader());
+	statBar.find('div').append('Discovering all Frames by lsslp.').append(createLoader());
 	//use lsslp to find all bpas in cluster
 	$.ajax({
 		url : 'lib/cmd.php',

xCAT-UI/js/nodes/physical.js

@@ -89,6 +89,11 @@ function extractGraphicalData(data){
 			graphicalNodeList[nodeName] = new Object();
 		}
 		
+		if('' == nodeName){
+		    tempNullNodes = 'all,';
+		    break;
+		}
+		
 		switch (data.msg.substr(5, 1)){
 			case '0': 
 			case '1':{

xCAT-UI/js/ui.js

@@ -512,6 +512,12 @@ function initPage() {
 		headers.eq(3).css('background-color', '#A9D0F5');
 		loadMonitorPage();
 	} else {
+	    includeJs("js/jquery/jquery.topzindex.min.js");
+        includeJs("js/nodes/nodeset.js");
+        includeJs("js/nodes/rnetboot.js");
+        includeJs("js/nodes/updatenode.js");
+        includeJs("js/nodes/physical.js");
+        includeJs("js/nodes/mtm.js");
 		headers.eq(0).css('background-color', '#A9D0F5');
 		loadNodesPage();
 	}

xCAT-server/lib/xcat/plugins/web.pm

@@ -791,7 +791,7 @@ sub web_rmcmonShow() {
 
 	my $attrName  = "";
 	my @attrValue = ();
-	$output = xCAT::Utils->runcmd( "monshow rmcmon $nodeRange -t 60 -a " . $attr, -1, 1 );
+	$output = xCAT::Utils->runcmd( "monshow rmcmon $nodeRange -t 60 -o p -a " . $attr, -1, 1 );
 	foreach (@$output) {
 		$temp = $_;
 		if ( $temp =~ /\t/ ) {