From 6b9007e64a56d2c7e7440a24f2561af2748a9246 Mon Sep 17 00:00:00 2001
From: phamt <phamt@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 30 Aug 2012 14:01:04 +0000
Subject: [PATCH] Undo some of the latest changes

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13663 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-UI/js/ui.js                  | 14 +++++++-------
 xCAT-UI/lib/functions.php         |  2 +-
 xCAT-UI/xcat/plugins/webportal.pm |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/xCAT-UI/js/ui.js b/xCAT-UI/js/ui.js
index 24224666a..065dcabe8 100644
--- a/xCAT-UI/js/ui.js
+++ b/xCAT-UI/js/ui.js
@@ -307,11 +307,11 @@ DataTable.prototype.add = function(rowCont) {
  * @param barId Status bar ID
  */
 function createStatusBar(barId) {
-    var statusBar = $('<div class="ui-corner-all" id="' + barId + '"></div>').css({
+	// Do not change the background color or color! This is handled by the theme
+	// the user selects.
+    var statusBar = $('<div class="ui-state-highlight ui-corner-all" id="' + barId + '"></div>').css({
         'margin-bottom': '5px',
         'min-height': '30px',
-        'background-color':'#7BBEDE', 
-    	'color': '#FFFFFF',
     	'max-height': '150px',
     	'overflow': 'auto'
     });
@@ -354,10 +354,10 @@ function createStatusBar(barId) {
  * @return Info bar
  */
 function createInfoBar(msg) {
-    var infoBar = $('<div class="ui-corner-all"></div>').css({
-    	'margin': '5px 0px', 
-    	'background-color':'#7BBEDE', 
-    	'color': '#FFFFFF'
+	// Do not change the background color or color! This is handled by the theme
+	// the user selects.
+    var infoBar = $('<div class="ui-state-highlight ui-corner-all"></div>').css({
+    	'margin': '5px 0px',
     });
     var icon = $('<span class="ui-icon ui-icon-info"></span>').css({
         'display': 'inline-block',
diff --git a/xCAT-UI/lib/functions.php b/xCAT-UI/lib/functions.php
index 36ba1f178..a2d1b6506 100644
--- a/xCAT-UI/lib/functions.php
+++ b/xCAT-UI/lib/functions.php
@@ -97,7 +97,7 @@ function submit_request($req, $skipVerify, $opts_array){
 
 		// Turn on output buffering
 		ob_start();
-		if ($flush){
+		if ($flush) {
 		    echo str_pad('',1024)."\n";
 		}
 		
diff --git a/xCAT-UI/xcat/plugins/webportal.pm b/xCAT-UI/xcat/plugins/webportal.pm
index fca826280..6bac4b854 100644
--- a/xCAT-UI/xcat/plugins/webportal.pm
+++ b/xCAT-UI/xcat/plugins/webportal.pm
@@ -234,10 +234,6 @@ sub provzlinux {
     # Set nodetype definitions
     $out = `chtab node=$node noderes.netboot=zvm nodetype.nodetype=osi nodetype.provmethod=install nodetype.os=$os nodetype.arch=$arch nodetype.profile=$profile nodetype.comments="owner:$owner"`;
 
-    # Update hosts table and DNS
-    `makehosts`;
-    `makedns`;
-
     # Create user directory entry replacing LXUSR with user ID
     # Use /opt/zhcp/conf/default.direct on zHCP as the template
     #    USER LXUSR PSWD 512M 1G G
@@ -316,6 +312,10 @@ sub provzlinux {
             $virt_addr = $virt_addr + 1;
         }
     }
+    
+    # Update hosts table and DNS
+    `makehosts`;
+    `makedns`;
 
     # Update DHCP
     `makedhcp -a`;