From 9ea17328d19ce98741e979e04c176c0033258bb2 Mon Sep 17 00:00:00 2001
From: xq2005 <xq2005@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 15 Dec 2010 10:20:59 +0000
Subject: [PATCH] use a new way to show selected lpars

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8414 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-UI/css/style.css               |  4 ++--
 xCAT-UI/js/nodes/physical.js        | 21 +++++++++++++--------
 xCAT-server/lib/xcat/plugins/web.pm |  2 +-
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/xCAT-UI/css/style.css b/xCAT-UI/css/style.css
index 80561eb6b..b09402e9f 100644
--- a/xCAT-UI/css/style.css
+++ b/xCAT-UI/css/style.css
@@ -675,8 +675,8 @@ table a:hover {
 }
 
 .lparStatus {
-	width: 5px;
-	height: 5px;
+	width: 10px;
+	height: 12px;
 }
 
 .fspcheckbox{
diff --git a/xCAT-UI/js/nodes/physical.js b/xCAT-UI/js/nodes/physical.js
index 6130d0723..023b66fe1 100644
--- a/xCAT-UI/js/nodes/physical.js
+++ b/xCAT-UI/js/nodes/physical.js
@@ -227,9 +227,9 @@ function createGraphical(bpa, fsp, area){
 	});
 	
 	$('.fspDiv2, .fspDiv4, .fspDiv42').tooltip({
-		position: "top center",
+		position: "center right",
 		relative : true,
-		offset : [20, 40],
+		offset : [10, 10],
 		effect: "fade"
 	});
 	
@@ -502,7 +502,7 @@ function createFspDiv(fspName, mtm, fsp){
 		}
 		var lparName = fsp[fspName]['children'][lparIndex];
 		var color = statusMap(lparList[lparName]);
-		lparStatusRow += '<td class="lparStatus" style="background-color:' + color + ';color:' + color + ';padding: 0px;font-size:1;border-width: 1px;border-style: solid;" name="' + lparName + '">1</td>';
+		lparStatusRow += '<td class="lparStatus" style="background-image:url(images/' + color + '.gif);padding: 0px;" name="' + lparName + '"></td>';
 	}
 	
 	//select the backgroud
@@ -515,7 +515,7 @@ function createFspDiv(fspName, mtm, fsp){
 	}
 		
 	//create return value
-	var retHtml = '<input style="margin:3px 3px 1px 4px;padding:0" class="fspcheckbox" type="checkbox" name="check_' + fspName + '">';
+	var retHtml = '<input style="margin:3px 3px 1px 4px;padding:0;" class="fspcheckbox" type="checkbox" name="check_' + fspName + '">';
 	retHtml += '<div value="' + fspName + '" class="' + divClass + '">';
 	retHtml += '<div class="lparDiv"><table><tbody><tr>' + lparStatusRow + '</tr></tbody></table></div></div>';
 	return retHtml;
@@ -582,6 +582,7 @@ function statusMap(status){
 		}
 		break;
 		default:
+			color = 'grey';
 			break;
 	}
 	
@@ -627,14 +628,18 @@ function getSelectNodes(){
  * @return 
  */
 function changeNode(lparName, status){
+	var imgUrl = '';
+	var checkFlag = true;
 	if ('select' == status){
 		selectNode[lparName] = 1;
-		$('#graphTable [name=' + lparName + ']').css('border-color', 'aqua');
-		$('.tooltip input[name="' + lparName + '"]').attr('checked', true);
+		imgUrl = 'url(images/s-'+ statusMap(lparList[lparName]) + '.gif)';
+		checkFlag = true;
 	}
 	else{
 		delete selectNode[lparName];
-		$('#graphTable [name=' + lparName + ']').css('border-color', '#BDBDBD');
-		$('.tooltip input[name="' + lparName + '"]').attr('checked', false);
+		imgUrl = 'url(images/'+ statusMap(lparList[lparName]) + '.gif)';
+		checkFlag = false;
 	}
+	$('#graphTable [name=' + lparName + ']').css('background-image', imgUrl);
+	$('.tooltip input[name="' + lparName + '"]').attr('checked', checkFlag);
 }
\ No newline at end of file
diff --git a/xCAT-server/lib/xcat/plugins/web.pm b/xCAT-server/lib/xcat/plugins/web.pm
index 470997e1e..124227efb 100644
--- a/xCAT-server/lib/xcat/plugins/web.pm
+++ b/xCAT-server/lib/xcat/plugins/web.pm
@@ -113,7 +113,7 @@ sub web_lsevent {
 			if ( $j == 3 ) {
 				$i++;
 				$j = 0;
-				push(@$data, {name=>$i, data=>$record});
+				push(@$data, $record);
 				$record = '';
 			}
 		}