Updated Branches: refs/heads/multiple-Vlans [created] 723444d5d
Multiple Vlan Ranges UI development Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/723444d5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/723444d5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/723444d5 Branch: refs/heads/multiple-Vlans Commit: 723444d5d33ab6ab6fa8eb7c468b0601cc38c88d Parents: 3d8e582 Author: Pranav Saxena <[email protected]> Authored: Tue Feb 5 13:31:58 2013 +0530 Committer: Pranav Saxena <[email protected]> Committed: Tue Feb 5 13:31:58 2013 +0530 ---------------------------------------------------------------------- ui/css/cloudstack3.css | 29 +++++++++++++++++++++++++++++ ui/scripts/ui-custom/zoneWizard.js | 10 ++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/723444d5/ui/css/cloudstack3.css ---------------------------------------------------------------------- diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css index eb42843..e31b2df 100644 --- a/ui/css/cloudstack3.css +++ b/ui/css/cloudstack3.css @@ -6897,6 +6897,12 @@ label.error { line-height: 13px; } +.multi-wizard.zone-wizard .select-container .physical-network-item form { + width: 344px; + float: left; +} + + .multi-wizard.zone-wizard .select-container .field .value { float: left; position: relative; @@ -10427,6 +10433,9 @@ div.ui-dialog div.acl div.multi-edit div.data div.data-body div.data-item table width: 65px; } + + + /*Autoscaler*/ .ui-dialog div.autoscaler { overflow: auto; @@ -10633,6 +10642,22 @@ div.ui-dialog div.autoscaler div.scale-up-policy div.hide { width: 14px; } +/* Multiple Vlan Ranges */ + +div.ui-dialog div.multi-wizard div.steps div.setup-guest-traffic div.content div.select-container div.physical-network-item [rel=vlanRange] div.expand { + background: #FFFFFF url("../images/sprites.png") repeat -541px -499px; + border: 1px solid #D0D0D0; + border-radius: 9px 9px 9px 9px; + cursor: pointer; + float: right; + height: 15px; + margin: 16px 320px 0 11px; + width: 14px; +} + + + + div.ui-dialog div.autoscaler div.scale-down-policy div.hide { background: #FFFFFF url("../images/minus.png") no-repeat 31% 54%; border: 1px solid #D0D0D0; @@ -10666,6 +10691,10 @@ div.ui-dialog div.autoscaler div.scale-down-policy div.expand { width: 14px; } + + + + div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-item div.name label { font-size: 11px; } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/723444d5/ui/scripts/ui-custom/zoneWizard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/ui-custom/zoneWizard.js b/ui/scripts/ui-custom/zoneWizard.js index 47fa385..f01eb88 100644 --- a/ui/scripts/ui-custom/zoneWizard.js +++ b/ui/scripts/ui-custom/zoneWizard.js @@ -742,6 +742,7 @@ var $physicalNetworks = physicalNetwork.getNetworks($wizard); var $tabs = guestTraffic.makeTabs($physicalNetworks, args); var $container = guestTraffic.getMainContainer($wizard); + var $expand = $('<div title="Add multiple VLAN Ranges">').addClass('expand'); // Cleanup guestTraffic.remove($wizard); @@ -753,6 +754,15 @@ $container.prepend($subnav); $container.find('.field').hide(); $container.find('[rel=vlanRange]').show(); + $expand.appendTo($container.find('.content .select-container .physical-network-item form [rel=vlanRange]')); + //Multiple Vlan Ranges functionality + $expand.click(function() { + + var $vlanClone = $container.find('[rel=vlanRange]:first').clone().removeClass('field').insertBefore($container.find('.expand')); + //$vlan.appendTo($container.find('.content .select-container .physical-network-item form')); + + }); + }, /**
