From bf92a204326c4ee670c0ae8b59230c7ec698d91f Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 23 Nov 2010 20:08:35 -0800
Subject: [PATCH] bug 7262: global settings page - set padding in value column.
 So, description won't be shifted into value column when value is empty.
 (merge from 2.2.beta1 branch to master branch)

---
 ui/jsp/globalsetting.jsp               |  2 +-
 ui/scripts/cloud.core.globalsetting.js | 13 ++-----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/ui/jsp/globalsetting.jsp b/ui/jsp/globalsetting.jsp
index 576eed4c2ed..12de196b2c4 100644
--- a/ui/jsp/globalsetting.jsp
+++ b/ui/jsp/globalsetting.jsp
@@ -77,7 +77,7 @@
             <div class="row_celltitles" id="name">
             </div>
         </div>
-        <div class="grid_row_cell" style="width: 23%; border:none;">
+        <div class="grid_row_cell" style="width: 23%; border:none; padding:1px;">
             <div class="row_celltitles" id="value">
             </div>
             <input class="text" id="value_edit" style="width: 120px; display: none;" type="text" />
diff --git a/ui/scripts/cloud.core.globalsetting.js b/ui/scripts/cloud.core.globalsetting.js
index 299f5e6f38e..11a887cc47e 100644
--- a/ui/scripts/cloud.core.globalsetting.js
+++ b/ui/scripts/cloud.core.globalsetting.js
@@ -58,17 +58,11 @@ function populateGlobalSettingGrid() {
     });    
 }
 
-var notApplicable = "Not applicable";
 var globalsettingGridIndex = 0;
 function globalsettingJSONToTemplate(jsonObj, template) {      
     (globalsettingGridIndex++ % 2 == 0)? template.addClass("even"): template.addClass("odd");		
-	template.find("#name").text(fromdb(jsonObj.name));
-	
-	if(fromdb(jsonObj.value).length > 0)
-	    template.find("#value").text(fromdb(jsonObj.value));
-	else
-	    template.find("#value").text(notApplicable);
-	
+	template.find("#name").text(fromdb(jsonObj.name));	
+	template.find("#value").text(fromdb(jsonObj.value));	
 	template.find("#value_edit").val(fromdb(jsonObj.value));	
 	template.find("#description").text(fromdb(jsonObj.description));
 }
@@ -98,9 +92,6 @@ function doEditGlobalSetting2($readonlyFields, $editFields) {
     $("#right_panel_content #tab_content_details").find("#globalsetting_template").each(function(index) {        
         var $thisRow =$(this);  
         
-        if($thisRow.find("#value_edit").val() == "" && $thisRow.find("#value").text() == notApplicable)
-            return;
-              
         if($thisRow.find("#value_edit").val() != $thisRow.find("#value").text()) {            
             // validate values        
             var isValid = true;