apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 13581

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

status 13581: resolved fixed
This commit is contained in:
Brian Federle 2012-02-10 14:22:52 -08:00
parent 2f6a946ee5
commit ae4a967ad7
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/index.jsp
View File

@ -568,7 +568,7 @@
zone-wizard-form="basicPhysicalNetwork" zone-wizard-form="basicPhysicalNetwork"
zone-wizard-prefilter="addNetscalerDevice"> zone-wizard-prefilter="addNetscalerDevice">
<ul class="subnav"> <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="public-network">Public traffic</li>
<li class="pod">Pod</li> <li class="pod">Pod</li>
<li class="guest-traffic">Guest Traffic</li> <li class="guest-traffic">Guest Traffic</li>
@ -584,7 +584,7 @@
<div class="setup-public-traffic" zone-wizard-prefilter="addPublicNetwork" <div class="setup-public-traffic" zone-wizard-prefilter="addPublicNetwork"
zone-wizard-step-id="configurePublicTraffic"> zone-wizard-step-id="configurePublicTraffic">
<ul class="subnav"> <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="public-network active">Public traffic</li>
<li class="pod">Pod</li> <li class="pod">Pod</li>
<li class="guest-traffic">Guest Traffic</li> <li class="guest-traffic">Guest Traffic</li>
@ -600,7 +600,7 @@
<div class="add-pod" zone-wizard-form="pod" <div class="add-pod" zone-wizard-form="pod"
zone-wizard-step-id="addPod"> zone-wizard-step-id="addPod">
<ul class="subnav"> <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="public-network">Public traffic</li>
<li class="pod active">Pod</li> <li class="pod active">Pod</li>
<li class="guest-traffic">Guest Traffic</li> <li class="guest-traffic">Guest Traffic</li>
@ -620,7 +620,7 @@
zone-wizard-step-id="configureGuestTraffic" zone-wizard-step-id="configureGuestTraffic"
zone-wizard-prefilter="configureGuestTraffic"> zone-wizard-prefilter="configureGuestTraffic">
<ul class="subnav"> <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="public-network">Public traffic</li>
<li class="pod">Pod</li> <li class="pod">Pod</li>
<li class="guest-traffic active">Guest Traffic</li> <li class="guest-traffic active">Guest Traffic</li>

10
ui/scripts/zoneWizard.js
View File

@ -59,13 +59,16 @@
var isShown; var isShown;
if(args.data['network-model'] == 'Basic') { if(args.data['network-model'] == 'Basic') {
if(selectedNetworkOfferingHavingSG == true && selectedNetworkOfferingHavingEIP == true && selectedNetworkOfferingHavingELB == true) { if(selectedNetworkOfferingHavingSG == true && selectedNetworkOfferingHavingEIP == true && selectedNetworkOfferingHavingELB == true) {
$('.conditional.elb').show();
isShown = true; isShown = true;
} }
else { else {
$('.conditional.elb').hide();
isShown = false; isShown = false;
} }
} }
else { //args.data['network-model'] == 'Advanced' else { //args.data['network-model'] == 'Advanced'
$('.conditional.elb').hide();
isShown = true; isShown = true;
} }
return isShown; return isShown;
@ -73,10 +76,13 @@
addNetscalerDevice: function(args) { //add Netscaler addNetscalerDevice: function(args) { //add Netscaler
var isShown; 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; isShown = true;
else $('.conditional.elb').show();
} else {
isShown= false; isShown= false;
$('.conditional.elb').hide();
}
return isShown; return isShown;
}, },