From 04f54ed29ed78bb3f5730567e7949859dffc78fa Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 19 Mar 2012 12:04:51 -0700
Subject: [PATCH] bug 14325: cloudstack 3.0 UI - add zone wizard - basic zone -
 show netscaler tab if selected network offering's provider is Netscaler. Hide
 netscaler tab otherwise.

---
 ui/index.jsp             | 10 ++++-----
 ui/scripts/zoneWizard.js | 44 +++++++++++++++++++---------------------
 2 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/ui/index.jsp b/ui/index.jsp
index c1d397c7dd7..d4aa46dfa18 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -563,7 +563,7 @@
                zone-wizard-form="basicPhysicalNetwork"
                zone-wizard-prefilter="addNetscalerDevice">
             <ul class="subnav">
-              <li class="conditional elb physical-network active"><fmt:message key="label.netScaler"/></li>
+              <li class="conditional netscaler physical-network active"><fmt:message key="label.netScaler"/></li>
               <li class="public-network"><fmt:message key="label.public.traffic"/></li>
               <li class="pod"><fmt:message key="label.pod"/></li>
               <li class="guest-traffic"><fmt:message key="label.guest.traffic"/></li>
@@ -580,7 +580,7 @@
           <div class="setup-public-traffic" zone-wizard-prefilter="addPublicNetwork"
                zone-wizard-step-id="configurePublicTraffic">
             <ul class="subnav">
-              <li class="conditional elb physical-network"><fmt:message key="label.netScaler"/></li>
+              <li class="conditional netscaler physical-network"><fmt:message key="label.netScaler"/></li>
               <li class="public-network active"><fmt:message key="label.public.traffic"/></li>
               <li class="pod"><fmt:message key="label.pod"/></li>
               <li class="guest-traffic"><fmt:message key="label.guest.traffic"/></li>
@@ -598,7 +598,7 @@
           <div class="add-pod" zone-wizard-form="pod"
                zone-wizard-step-id="addPod">
             <ul class="subnav">
-              <li class="conditional elb physical-network"><fmt:message key="label.netScaler"/></li>
+              <li class="conditional netscaler physical-network"><fmt:message key="label.netScaler"/></li>
               <li class="public-network"><fmt:message key="label.public.traffic"/></li>
               <li class="pod active"><fmt:message key="label.pod"/></li>
               <li class="guest-traffic"><fmt:message key="label.guest.traffic"/></li>
@@ -619,7 +619,7 @@
                zone-wizard-step-id="configureGuestTraffic"
                zone-wizard-prefilter="configureGuestTraffic">
             <ul class="subnav">
-              <li class="conditional elb physical-network"><fmt:message key="label.netScaler"/></li>
+              <li class="conditional netscaler physical-network"><fmt:message key="label.netScaler"/></li>
               <li class="public-network"><fmt:message key="label.public.traffic"/></li>
               <li class="pod"><fmt:message key="label.pod"/></li>
               <li class="guest-traffic active"><fmt:message key="label.guest.traffic"/></li>
@@ -639,7 +639,7 @@
           <div class="setup-storage-traffic" zone-wizard-prefilter="configureStorageTraffic"
                zone-wizard-step-id="configureStorageTraffic">
             <ul class="subnav">
-              <li class="conditional elb physical-network"><fmt:message key="label.netScaler"/></li>
+              <li class="conditional netscaler physical-network"><fmt:message key="label.netScaler"/></li>
               <li class="public-network"><fmt:message key="label.public.traffic"/></li>
               <li class="pod"><fmt:message key="label.pod"/><</li>
               <li class="guest-traffic"><fmt:message key="label.guest.traffic"/></li>
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index f98254b1cd0..b5fd1bc0a2f 100644
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -3,10 +3,10 @@
   var selectedNetworkOfferingHavingSG = false;
   var selectedNetworkOfferingHavingEIP = false;
   var selectedNetworkOfferingHavingELB = false;
+	var selectedNetworkOfferingHavingNetscaler = false;
   var returnedPublicVlanIpRanges = []; //public VlanIpRanges returned by API
   var configurationUseLocalStorage = false;
-	var selectedNetworkOfferingHavingNetscaler = false;
-	
+		
   cloudStack.zoneWizard = {
     customUI: {
       publicTrafficIPRange: function(args) {
@@ -101,43 +101,40 @@
     },
 
     preFilters: {
+		  addNetscalerDevice: function(args) { //add Netscaler
+        var isShown;        
+				if(selectedNetworkOfferingHavingNetscaler == true) {
+          isShown = true;
+          $('.conditional.netscaler').show();
+        } else {
+          isShown= false;
+          $('.conditional.netscaler').hide();
+        }
+        return isShown;
+      },
+		
       addPublicNetwork: function(args) {		
         var isShown;
 				var $publicTrafficDesc = $('.zone-wizard:visible').find('#add_zone_public_traffic_desc');	 
         if(args.data['network-model'] == 'Basic') {
           if(selectedNetworkOfferingHavingSG == true && selectedNetworkOfferingHavingEIP == true && selectedNetworkOfferingHavingELB == true) {
-            $('.conditional.elb').show();
             isShown = true;
           }
-          else {
-            $('.conditional.elb').hide();
+          else {            
             isShown = false;
           }			
 					
 					$publicTrafficDesc.find('#for_basic_zone').css('display', 'inline');
 					$publicTrafficDesc.find('#for_advanced_zone').hide();					
         }
-        else { //args.data['network-model'] == 'Advanced'
-          $('.conditional.elb').hide();
+        else { //args.data['network-model'] == 'Advanced'          
           isShown = true;					
 					
 					$publicTrafficDesc.find('#for_advanced_zone').css('display', 'inline');
 					$publicTrafficDesc.find('#for_basic_zone').hide();					
         }
         return isShown;
-      },
-
-      addNetscalerDevice: function(args) { //add Netscaler
-        var isShown;
-        if(args.data['network-model'] == 'Basic' && (selectedNetworkOfferingHavingSG == true && selectedNetworkOfferingHavingEIP == true && selectedNetworkOfferingHavingELB == true)) {
-          isShown = true;
-          $('.conditional.elb').show();
-        } else {
-          isShown= false;
-          $('.conditional.elb').hide();
-        }
-        return isShown;
-      },
+      },   
 
       setupPhysicalNetwork: function(args) {
         return args.data['network-model'] == 'Advanced';
@@ -1477,8 +1474,9 @@
                                                                   else {
                                                                     $("body").stopTime(updateNetworkServiceProviderTimer);
                                                                     if (result.jobstatus == 1) { //Security group provider has been enabled successfully
-                                                                      //"ElasticIP + ElasticLB"
-                                                                      if(selectedNetworkOfferingHavingEIP == true && selectedNetworkOfferingHavingELB == true) { //inside "selectedNetworkOfferingHavingSG == true" section
+                                                                      //debugger;
+																																			//netscaler
+                                                                      if(selectedNetworkOfferingHavingNetscaler == true) { //inside "selectedNetworkOfferingHavingSG == true" section
                                                                         //add netscaler provider (start)
                                                                         $.ajax({
                                                                           url: createURL("addNetworkServiceProvider&name=Netscaler&physicalnetworkid=" + args.data.returnedBasicPhysicalNetwork.id),
@@ -1519,7 +1517,7 @@
                                                                         });
                                                                         //add netscaler provider (end)
                                                                       }
-                                                                      else { //no "ElasticIP + ElasticLB"
+                                                                      else { //selectedNetworkOfferingHavingNetscaler == false
                                                                         //create a guest network for basic zone
                                                                         var array2 = [];
                                                                         array2.push("&zoneid=" + args.data.returnedZone.id);