From 5c35251106ab5a6fd91e2be693da76f8ac9e6848 Mon Sep 17 00:00:00 2001
From: phamt <phamt@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 17 Mar 2011 17:59:18 +0000
Subject: [PATCH] Consolidate mgt options. Changed HTML container for xdsh
 command to <pre>.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9078 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-UI/js/nodes/nodes.js | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/xCAT-UI/js/nodes/nodes.js b/xCAT-UI/js/nodes/nodes.js
index ebd563c2e..1f185fc6e 100644
--- a/xCAT-UI/js/nodes/nodes.js
+++ b/xCAT-UI/js/nodes/nodes.js
@@ -264,9 +264,7 @@ function mkAddNodeLink() {
     		+ '<select id="mgt" name="mgt">'
     			+ '<option>ipmi</option>' 
     			+ '<option>blade</option>'
-    			+ '<option>hmc</option>' 
-    			+ '<option>ivm</option>'
-    			+ '<option>fsp</option>'
+    			+ '<option>hmc</option>'
     			+ '<option>zvm</option>'
     		+ '</select>'
     	+ '</div>');
@@ -321,17 +319,11 @@ function mkAddNodeLink() {
 			    		case "blade":
 			        		plugin = new bladePlugin();
 			        		break;
-			    		case "fsp":
-			    			plugin = new fspPlugin();
-			    			break;
 			    		case "hmc":
 			    			plugin = new hmcPlugin();
 			    			break;
 			    		case "ipmi":
 			    			plugin = new ipmiPlugin();
-			    			break;		
-			    		case "ivm":
-			    			plugin = new ivmPlugin();
 			    			break;
 			    		case "zvm":
 			    			plugin = new zvmPlugin();
@@ -1880,10 +1872,10 @@ function updateStatusBar(data) {
 		$('#' + statBarId).find('img').hide();
 		
 		// Write ajax response to status bar
-		var prg = $('<p></p>');
+		var prg = $('<pre style="margin: 0px;"></pre>');
 		for (var i in rsp) {
 			for (var j in tgts) {
-				rsp[i] = rsp[i].replace(new RegExp(tgts[j] + ':', 'g'), '<br>');
+				rsp[i] = rsp[i].replace(new RegExp(tgts[j] + ':', 'g'), '');
 			}
 
 			prg.append(rsp[i]);