You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2012/11/15 20:42:49 UTC
git commit: Zone wizard UI: Change isolation mode selection
Updated Branches:
refs/heads/master 08d16cf4d -> 83229aa46
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.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/83229aa4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/83229aa4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/83229aa4
Branch: refs/heads/master
Commit: 83229aa460f40abaf200b70a1172e36d4583f9eb
Parents: 08d16cf
Author: Brian Federle <br...@citrix.com>
Authored: Thu Nov 15 11:26:59 2012 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Nov 15 11:42:00 2012 -0800
----------------------------------------------------------------------
ui/index.jsp | 11 +----------
ui/scripts/ui-custom/zoneWizard.js | 3 ++-
2 files changed, 3 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/83229aa4/ui/index.jsp
----------------------------------------------------------------------
diff --git a/ui/index.jsp b/ui/index.jsp
index 072f717..9031d27 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>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/83229aa4/ui/scripts/ui-custom/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/zoneWizard.js b/ui/scripts/ui-custom/zoneWizard.js
index 6255ab8..34e0204 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;
}
}