From 83229aa460f40abaf200b70a1172e36d4583f9eb Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Thu, 15 Nov 2012 11:26:59 -0800
Subject: [PATCH] Zone wizard UI: Change isolation mode selection

-Remove VLAN + SG radio buttons; replace with 'Security groups'
checkbox

-Pass boolean 'zone.sgEnabled' to zoneWizard action handler, instead of
'zone.isolationMode' from before.
---
 ui/index.jsp                       | 11 +----------
 ui/scripts/ui-custom/zoneWizard.js |  3 ++-
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/ui/index.jsp b/ui/index.jsp
index 072f717a132..9031d273f68 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -498,22 +498,13 @@ under the License.
                       <div class="title">
                         <fmt:message key="label.isolation.mode"/>
                       </div>
-                      
-                      <!-- VLAN -->
-                      <div class="select-area">
-                        <div class="desc">
-                          <fmt:message key="message.advanced.virtual"/>
-                        </div>
-                        <input type="radio" name="zone-isolation-mode" value="VLAN" disabled="disabled" checked="checked" />
-                        <label>VLAN</label>
-                      </div>
 
                       <!-- Security groups -->
                       <div class="select-area">
                         <div class="desc">
                           <fmt:message key="message.advanced.security.group"/>
                         </div>
-                        <input type="radio" name="zone-isolation-mode" value="SG" disabled="disabled" />
+                        <input type="checkbox" name="zone-advanced-sg-enabled" disabled="disabled" />
                         <label><fmt:message key="label.menu.security.groups"/></label>
                       </div>
                     </div>
diff --git a/ui/scripts/ui-custom/zoneWizard.js b/ui/scripts/ui-custom/zoneWizard.js
index 6255ab86b9b..34e0204d9c5 100644
--- a/ui/scripts/ui-custom/zoneWizard.js
+++ b/ui/scripts/ui-custom/zoneWizard.js
@@ -156,7 +156,8 @@
       
       // Include zone isolation mode, supported for Advanced zones only
       if (groupedForms.zone.networkType == 'Advanced') {
-        groupedForms.zone.isolationMode = $forms.find('input[name=zone-isolation-mode]:checked').val();
+        groupedForms.zone.sgEnabled = $forms.find('input[name=zone-advanced-sg-enabled]')
+          .is(':checked') ? true : false;
       }
     }