From 3dd47270604629b66cb9d1ac9fcd084f50c753ca Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 16 Nov 2010 17:35:34 -0800
Subject: [PATCH] new UI - related UI change for new parameter "networktype" of
 AddZone API.

---
 ui/jsp/resource.jsp               | 4 ++--
 ui/scripts/cloud.core.resource.js | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ui/jsp/resource.jsp b/ui/jsp/resource.jsp
index 48353733dca..73d6322ca35 100644
--- a/ui/jsp/resource.jsp
+++ b/ui/jsp/resource.jsp
@@ -123,7 +123,7 @@
                     <div class="zonepopup_selectionpanel">
                       
                         <div class="zonepopup_selectionbox">
-                            <input type="radio" name="basic_advanced" value="basic_mode" id="basic_mode" class="radio" checked />
+                            <input type="radio" name="basic_advanced" value="Basic" id="Basic" class="radio" checked />
                             <label class="label">
                                 Basic Mode</label>
                             <div class="zonepopup_selectiondescriptionbox">
@@ -137,7 +137,7 @@
                             </div>
                         </div>
                         <div class="zonepopup_selectionbox">
-                            <input type="radio" name="basic_advanced" value="advanced_mode" id="advanced_mode" class="radio" />
+                            <input type="radio" name="basic_advanced" value="Advanced" id="Advanced" class="radio" />
                             <label class="label">
                                Advanced Mode</label>
                             <div class="zonepopup_selectiondescriptionbox">
diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js
index faa9998ec5e..17029a7a539 100644
--- a/ui/scripts/cloud.core.resource.js
+++ b/ui/scripts/cloud.core.resource.js
@@ -639,14 +639,14 @@ function initAddZoneWizard() {
                 closeAddZoneWizard();
                 break;
             
-            case "basic_mode":  //create VLAN in pod-level      
+            case "Basic":  //create VLAN in pod-level      
                 //hide Zone VLAN Range in Add Zone(step 2), show Guest IP Range in Add Pod(step3)                 
                 $thisWizard.find("#step2").find("#add_zone_vlan_container").hide();
                 $thisWizard.find("#step3").find("#guestip_container, #guestnetmask_container").show();
                 return true;
                 break;
                 
-            case "advanced_mode":  //create VLAN in zone-level 
+            case "Advanced":  //create VLAN in zone-level 
                 //show Zone VLAN Range in Add Zone(step 2), hide Guest IP Range in Add Pod(step3) 
                 $thisWizard.find("#step2").find("#add_zone_vlan_container").show();  
                 $thisWizard.find("#step3").find("#guestip_container, #guestnetmask_container").hide();   
@@ -730,6 +730,9 @@ function addZoneWizardSubmit($thisWizard) {
 	
 	var moreCriteria = [];	
 	
+	var networktype = $thisWizard.find("#step1").find("input:radio[name=basic_advanced]:checked").val();  //"Basic", "Advanced"
+	moreCriteria.push("&networktype="+todb(networktype));
+	
 	var name = trim($thisWizard.find("#add_zone_name").val());
 	moreCriteria.push("&name="+todb(name));