bug 14603

-Disable display of public traffic icon for basic zone, non-EIP/ELB

-Show public traffic icon as 'required' for basic zone in EIP/ELB

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;

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 [];
       }