From f0e3cad6f93bee5e01368a2ca2105835d016877d Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 17 Feb 2012 10:54:10 -0800
Subject: [PATCH] cloudstack 3.0 new UI - add zone wizard - guest traffic -
 show different description for basic zone and advanced zone.

---
 ui/index.jsp             |  3 ++-
 ui/scripts/zoneWizard.js | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ui/index.jsp b/ui/index.jsp
index ee1e6ca0229..f194e5d5976 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -615,7 +615,8 @@
             </ul>
 
             <div class="info-desc" id="add_zone_guest_traffic_desc">
-             
+              <span id="for_basic_zone" style="display:none"><fmt:message key="message.guest.traffic.in.basic.zone"/></span>
+							<span id="for_advanced_zone" style="display:none"><fmt:message key="message.guest.traffic.in.advanced.zone"/></span>
             </div>
             <div class="content input-area">
               <div class="select-container"></div>
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 49c9a06795a..53221bd6ef9 100644
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -367,7 +367,18 @@
       },
 
       guestTraffic: {
-        preFilter: function(args) {
+        preFilter: function(args) {				                 		
+          var $guestTrafficDesc = $("#add_zone_guest_traffic_desc");	      
+          //debugger;					
+          if (args.data['network-model'] == 'Basic') {
+            $guestTrafficDesc.find("#for_basic_zone").css('display', 'inline');
+						$guestTrafficDesc.find("#for_advanced_zone").hide();
+          }
+          else { //args.data['network-model'] == 'Advanced'
+            $guestTrafficDesc.find("#for_advanced_zone").css('display', 'inline');
+						$guestTrafficDesc.find("#for_basic_zone").hide();
+          }		
+				
           var selectedZoneObj = {
             networktype: args.data['network-model']
           };