From ea9ef6f07601eee4a960d3aa3e4305c6672609b6 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 14 Feb 2011 17:19:26 -0800
Subject: [PATCH] bug 8263: Zone page - details tab - add isPublic row.

---
 ui/index.jsp                  |  4 +++-
 ui/jsp/zone.jsp               | 12 +++++++++++-
 ui/scripts/cloud.core.zone.js |  5 +++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/ui/index.jsp b/ui/index.jsp
index e9bd32718b7..1a19af6b9ef 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -93,7 +93,9 @@
 		'label.PreSetup': '<fmt:message key="label.PreSetup"/>',
 		'label.iscsi': '<fmt:message key="label.iscsi"/>',
 		'label.VMFS.datastore': '<fmt:message key="label.VMFS.datastore"/>',
-		'label.none': '<fmt:message key="label.none"/>'
+		'label.none': '<fmt:message key="label.none"/>',
+		'label.yes': '<fmt:message key="label.yes"/>',
+		'label.no': '<fmt:message key="label.no"/>'		
 	};	
 	</script>
 </head>
diff --git a/ui/jsp/zone.jsp b/ui/jsp/zone.jsp
index e04d6cdefbf..880e9f6b238 100644
--- a/ui/jsp/zone.jsp
+++ b/ui/jsp/zone.jsp
@@ -167,8 +167,18 @@ dictionary = {
                         <input class="text" id="guestcidraddress_edit" style="width: 200px; display: none;" type="text" />
 	                    <div id="guestcidraddress_edit_errormsg" style="display:none"></div>       
                     </div>
-                </div>
+                </div>                
                 <div class="grid_rows even">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <fmt:message key="label.public"/>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="ispublic">
+                        </div>                        
+                    </div>
+                </div>                
+                <div class="grid_rows odd">
                     <div class="grid_row_cell" style="width: 20%;">
                         <div class="row_celltitles">
                             <fmt:message key="label.domain"/>:</div>
diff --git a/ui/scripts/cloud.core.zone.js b/ui/scripts/cloud.core.zone.js
index 34ea8dc9d1c..484e8891293 100644
--- a/ui/scripts/cloud.core.zone.js
+++ b/ui/scripts/cloud.core.zone.js
@@ -163,6 +163,11 @@ function zoneJsonToDetailsTab() {
     $thisTab.find("#guestcidraddress_edit").val(fromdb(jsonObj.guestcidraddress));   
         
     $thisTab.find("#domain").text(fromdb(jsonObj.domain)); 
+    
+    if(jsonObj.domain == null)
+        $thisTab.find("#ispublic").text(g_dictionary["label.yes"]);
+    else
+        $thisTab.find("#ispublic").text(g_dictionary["label.no"]);
         
     //actions ***   
     var $actionLink = $thisTab.find("#action_link");