From b2f37280179a93180700476cda2951680ec24f8d Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 14 Dec 2010 14:24:34 -0800
Subject: [PATCH] Network Offering page - add availability field.

---
 ui/jsp/networkoffering.jsp               | 37 +++++++++++++++---------
 ui/scripts/cloud.core.networkoffering.js | 15 +++++-----
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/ui/jsp/networkoffering.jsp b/ui/jsp/networkoffering.jsp
index b057e5aba8a..194a0c1ea07 100644
--- a/ui/jsp/networkoffering.jsp
+++ b/ui/jsp/networkoffering.jsp
@@ -93,21 +93,10 @@
 	            <div class="grid_rows odd">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
-	                        Type:</div>
+	                        Availability:</div>
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
-	                    <div class="row_celltitles" id="type">
-	                    </div>
-	                </div>
-	            </div>
-	            
-	            <div class="grid_rows odd">
-	                <div class="grid_row_cell" style="width: 20%;">
-	                    <div class="row_celltitles">
-	                        Traffic Type:</div>
-	                </div>
-	                <div class="grid_row_cell" style="width: 79%;">
-	                    <div class="row_celltitles" id="traffictype">
+	                    <div class="row_celltitles" id="availability">
 	                    </div>
 	                </div>
 	            </div>
@@ -133,6 +122,28 @@
 	                    </div>
 	                </div>
 	            </div>
+	            
+	            <div class="grid_rows odd">
+	                <div class="grid_row_cell" style="width: 20%;">
+	                    <div class="row_celltitles">
+	                        Type:</div>
+	                </div>
+	                <div class="grid_row_cell" style="width: 79%;">
+	                    <div class="row_celltitles" id="type">
+	                    </div>
+	                </div>
+	            </div>
+	            
+	            <div class="grid_rows odd">
+	                <div class="grid_row_cell" style="width: 20%;">
+	                    <div class="row_celltitles">
+	                        Traffic Type:</div>
+	                </div>
+	                <div class="grid_row_cell" style="width: 79%;">
+	                    <div class="row_celltitles" id="traffictype">
+	                    </div>
+	                </div>
+	            </div>	            
 	           
 	        </div>        
 	        <div class="grid_botactionpanel">
diff --git a/ui/scripts/cloud.core.networkoffering.js b/ui/scripts/cloud.core.networkoffering.js
index a34ec779d07..4fa4795f461 100644
--- a/ui/scripts/cloud.core.networkoffering.js
+++ b/ui/scripts/cloud.core.networkoffering.js
@@ -144,7 +144,7 @@ function networkOfferingJsonToDetailsTab() {
         dataType: "json",
         async: false,
         success: function(json) {  
-            var items = json.listNetworkOfferingsresponse.NetworkOffering;
+            var items = json.listnetworkofferingsresponse.networkoffering;
             if(items != null && items.length > 0) {
                 jsonObj = items[0];
                 $midmenuItem1.data("jsonObj", jsonObj);  
@@ -160,14 +160,15 @@ function networkOfferingJsonToDetailsTab() {
     
     $thisTab.find("#displaytext").text(fromdb(jsonObj.displaytext));
     //$thisTab.find("#displaytext_edit").val(fromdb(jsonObj.displaytext));
-    
-    $thisTab.find("#type").text(fromdb(jsonObj.type));
-    $thisTab.find("#traffictype").text(fromdb(jsonObj.traffictype));
-    
+     
+    $thisTab.find("#availability").text(fromdb(jsonObj.availability)); 
+     
     setBooleanReadField(jsonObj.isdefault, $thisTab.find("#isdefault"));
     setBooleanReadField(jsonObj.specifyvlan, $thisTab.find("#specifyvlan"));
-    
-    
+      
+    $thisTab.find("#type").text(fromdb(jsonObj.type));
+    $thisTab.find("#traffictype").text(fromdb(jsonObj.traffictype));
+   
     //actions ***
     var $actionMenu = $("#right_panel_content #tab_content_details #action_link #action_menu");
     $actionMenu.find("#action_list").empty();