From 7bb421575149850e4381f6cec8114169caabd6ec Mon Sep 17 00:00:00 2001
From: phamt <phamt@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 20 Sep 2010 18:25:09 +0000
Subject: [PATCH] Renamed directories under lib/ to not be capitalized.  Added
 "add node" link to add new nodes.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7533 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-UI/css/style.css             | 3 +--
 xCAT-UI/js/nodes/nodes.js         | 4 ++++
 xCAT-UI/lib/jsonwrapper_inner.php | 2 +-
 xCAT-UI/lib/rcons.php             | 2 +-
 xCAT-UI/xCAT-UI.spec              | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/xCAT-UI/css/style.css b/xCAT-UI/css/style.css
index 2141f9521..0de7c9cd2 100644
--- a/xCAT-UI/css/style.css
+++ b/xCAT-UI/css/style.css
@@ -116,10 +116,9 @@ body {
 #groups a {
 	font: 12px verdana, arial, helvetica, sans-serif;
 	color: #0000FF;
-	display: block;
+	display: inline-table;
 	padding: 5px 15px 15px 5px;
 	text-decoration: none;
-	display: block;
 }
 
 #groups a:hover {
diff --git a/xCAT-UI/js/nodes/nodes.js b/xCAT-UI/js/nodes/nodes.js
index 716b1fb54..2150d7196 100644
--- a/xCAT-UI/js/nodes/nodes.js
+++ b/xCAT-UI/js/nodes/nodes.js
@@ -150,6 +150,10 @@ function loadGroups(data) {
     		} // End of onselect
     	} // End of callback
     });
+	
+	// Add nodes link
+	var groupsAction = $('<a href="#">Add node</a>');
+	$('#groups').append(groupsAction);
 }
 
 /**
diff --git a/xCAT-UI/lib/jsonwrapper_inner.php b/xCAT-UI/lib/jsonwrapper_inner.php
index c3e616835..3a8a5a08f 100644
--- a/xCAT-UI/lib/jsonwrapper_inner.php
+++ b/xCAT-UI/lib/jsonwrapper_inner.php
@@ -1,5 +1,5 @@
 <?php
-require_once 'JSON/JSON.php';
+require_once 'json/JSON.php';
 
 function json_encode($arg) {
 	global $services_json;
diff --git a/xCAT-UI/lib/rcons.php b/xCAT-UI/lib/rcons.php
index 7e4a67810..8436af69c 100644
--- a/xCAT-UI/lib/rcons.php
+++ b/xCAT-UI/lib/rcons.php
@@ -22,7 +22,7 @@
 	if (isset($_POST['f'])){
 		$pythonProcess = exec('ps -aef | grep -v grep | grep ajaxterm.py');
 		if ('' == $pythonProcess){
-			exec('nohup ' . dirname(__FILE__) . '/AJAXTERM/ajaxterm.py >/dev/null 2>&1 &');
+			exec('nohup ' . dirname(__FILE__) . '/ajaxterm/ajaxterm.py >/dev/null 2>&1 &');
 		}
 		
 		sleep(1);
diff --git a/xCAT-UI/xCAT-UI.spec b/xCAT-UI/xCAT-UI.spec
index 10a2e2307..21f876103 100644
--- a/xCAT-UI/xCAT-UI.spec
+++ b/xCAT-UI/xCAT-UI.spec
@@ -38,7 +38,7 @@ mkdir -p $RPM_BUILD_ROOT%{prefix}/ui
 set +x
 cp -r * $RPM_BUILD_ROOT%{prefix}/ui
 chmod 755 $RPM_BUILD_ROOT%{prefix}/ui/*
-chmod 755 $RPM_BUILD_ROOT%{prefix}/ui/lib/AJAXTERM/*.py
+chmod 755 $RPM_BUILD_ROOT%{prefix}/ui/lib/ajaxterm/*.py
 set -x
 
 %files