From ae4a967ad7fde183cfa57b65816bcac65a6d050b Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Fri, 10 Feb 2012 14:22:52 -0800
Subject: [PATCH] bug 13581

Hide NetScaler sub-nav text when not using ELB/EIP network offering

status 13581: resolved fixed
---
 ui/index.jsp             |  8 ++++----
 ui/scripts/zoneWizard.js | 10 ++++++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ui/index.jsp b/ui/index.jsp
index 5695cf1c0e3..df81cdbd9e9 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -568,7 +568,7 @@
                zone-wizard-form="basicPhysicalNetwork"
                zone-wizard-prefilter="addNetscalerDevice">
             <ul class="subnav">
-              <li class="physical-network active">Netscaler</li>
+              <li class="conditional elb physical-network active">Netscaler</li>
               <li class="public-network">Public traffic</li>
               <li class="pod">Pod</li>
               <li class="guest-traffic">Guest Traffic</li>
@@ -584,7 +584,7 @@
           <div class="setup-public-traffic" zone-wizard-prefilter="addPublicNetwork"
                zone-wizard-step-id="configurePublicTraffic">
             <ul class="subnav">
-              <li class="physical-network">Netscaler</li>
+              <li class="conditional elb physical-network">Netscaler</li>
               <li class="public-network active">Public traffic</li>
               <li class="pod">Pod</li>
               <li class="guest-traffic">Guest Traffic</li>
@@ -600,7 +600,7 @@
           <div class="add-pod" zone-wizard-form="pod"
                zone-wizard-step-id="addPod">
             <ul class="subnav">
-              <li class="physical-network">Netscaler</li>
+              <li class="conditional elb physical-network">Netscaler</li>
               <li class="public-network">Public traffic</li>
               <li class="pod active">Pod</li>
               <li class="guest-traffic">Guest Traffic</li>
@@ -620,7 +620,7 @@
                zone-wizard-step-id="configureGuestTraffic"
                zone-wizard-prefilter="configureGuestTraffic">
             <ul class="subnav">
-              <li class="physical-network">Netscaler</li>
+              <li class="conditional elb physical-network">Netscaler</li>
               <li class="public-network">Public traffic</li>
               <li class="pod">Pod</li>
               <li class="guest-traffic active">Guest Traffic</li>
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 471ad242168..2114a8d6ddb 100644
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -59,13 +59,16 @@
 				var isShown; 
 				if(args.data['network-model'] == 'Basic') {
 				  if(selectedNetworkOfferingHavingSG == true && selectedNetworkOfferingHavingEIP == true && selectedNetworkOfferingHavingELB == true) {
+            $('.conditional.elb').show();
             isShown = true;
           }			
           else {
+            $('.conditional.elb').hide();
             isShown = false;
           }	
 				}
 				else { //args.data['network-model'] == 'Advanced'
+          $('.conditional.elb').hide();
 				  isShown = true; 
 				}
 				return isShown;
@@ -73,10 +76,13 @@
 
       addNetscalerDevice: function(args) { //add Netscaler
 			  var isShown;
-				if(args.data['network-model'] == 'Basic' && (selectedNetworkOfferingHavingSG == true && selectedNetworkOfferingHavingEIP == true && selectedNetworkOfferingHavingELB == true))
+				if(args.data['network-model'] == 'Basic' && (selectedNetworkOfferingHavingSG == true && selectedNetworkOfferingHavingEIP == true && selectedNetworkOfferingHavingELB == true)) {
 				  isShown = true;
-				else
+          $('.conditional.elb').show();
+        } else {
 				  isShown= false;
+          $('.conditional.elb').hide();
+        }
 				return isShown;				
       },