diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css index a487b3a1e8f..ecb499ec674 100644 --- a/ui/css/cloudstack3.css +++ b/ui/css/cloudstack3.css @@ -5830,6 +5830,19 @@ label.error { cursor: not-allowed; } +.multi-wizard.zone-wizard .traffic-types-drag-area ul > li.disabled { + display: none; +} + +.multi-wizard.zone-wizard li.traffic-type-draggable.disabled { + /*+opacity:50%;*/ + filter: alpha(opacity=50); + -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50); + -moz-opacity: 0.5; + opacity: 0.5; + cursor: not-allowed; +} + .multi-wizard.zone-wizard li.traffic-type-draggable.management { background-position: 0px -1161px; height: 52px; diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index 969ed1dfaa2..7f35feea6fa 100644 --- a/ui/scripts/zoneWizard.js +++ b/ui/scripts/zoneWizard.js @@ -59,13 +59,19 @@ selectedNetworkOfferingHavingELB)) { return [ 'management', + 'guest', + 'public' + ]; + } else if (args.data.zone.networkType == 'Advanced') { + return [ + 'management', + 'public', 'guest' ]; } else { return [ 'management', - 'guest', - 'public' + 'guest' ]; } }, @@ -73,9 +79,9 @@ disabledTrafficTypes: function(args) { if (args.data.zone.networkType == 'Basic' && (selectedNetworkOfferingHavingEIP || selectedNetworkOfferingHavingELB)) { - return [ - 'public' - ]; + return []; + } else if (args.data.zone.networkType == 'Basic') { + return ['public']; } else { return []; }