Updated Branches: refs/heads/multiple-Vlans 723444d5d -> b1ee7105f
Multiple Vlans 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/b1ee7105 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b1ee7105 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b1ee7105 Branch: refs/heads/multiple-Vlans Commit: b1ee7105f57aae268595fdc3c16d950db8e3ba75 Parents: 723444d Author: Pranav Saxena <[email protected]> Authored: Wed Feb 6 17:21:33 2013 +0530 Committer: Pranav Saxena <[email protected]> Committed: Wed Feb 6 17:21:33 2013 +0530 ---------------------------------------------------------------------- ui/css/cloudstack3.css | 22 ++++++++++++++++++++++ ui/scripts/ui-custom/zoneWizard.js | 11 +++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b1ee7105/ui/css/cloudstack3.css ---------------------------------------------------------------------- diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css index e31b2df..71e67bf 100644 --- a/ui/css/cloudstack3.css +++ b/ui/css/cloudstack3.css @@ -10655,6 +10655,28 @@ div.ui-dialog div.multi-wizard div.steps div.setup-guest-traffic div.content div width: 14px; } +div.ui-dialog div.multi-wizard div.steps div.setup-guest-traffic div.content div.select-container div.physical-network-item [rel=vlanRange] div.hide { + background: url("../images/minus.png") no-repeat scroll 38% 59% #FFFFFF; + border: 1px solid #D0D0D0; + border-radius: 9px 9px 9px 9px; + cursor: pointer; + float: right; + height: 15px; + margin-right:-5px; + margin-top:17px; + width: 14px; +} + + div.ui-dialog div.multi-wizard div.steps div.setup-guest-traffic div.content div.select-container div.physical-network-item div.expand div.expand-label{ + + float: left; + font-size: 11px; + margin-left: 18px; + margin-top: 2px; + width: 100px; + +} + http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b1ee7105/ui/scripts/ui-custom/zoneWizard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/ui-custom/zoneWizard.js b/ui/scripts/ui-custom/zoneWizard.js index f01eb88..5d5b289 100644 --- a/ui/scripts/ui-custom/zoneWizard.js +++ b/ui/scripts/ui-custom/zoneWizard.js @@ -743,6 +743,9 @@ var $tabs = guestTraffic.makeTabs($physicalNetworks, args); var $container = guestTraffic.getMainContainer($wizard); var $expand = $('<div title="Add multiple VLAN Ranges">').addClass('expand'); + var $expandlabel = $('<div>').addClass('expand-label').html('Add VLAN Range'); + var $hide = $('<div title="Hide VLAN Range">').addClass('hide'); + var $hidelabel = $('<div>').addClass('hide-label').html('Hide VLAN Range'); // Cleanup guestTraffic.remove($wizard); @@ -755,14 +758,22 @@ $container.find('.field').hide(); $container.find('[rel=vlanRange]').show(); $expand.appendTo($container.find('.content .select-container .physical-network-item form [rel=vlanRange]')); + $expandlabel.appendTo($container.find('.content .select-container .physical-network-item form .expand')); + //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')); + $hide.clone().appendTo($vlanClone); + }); + + $hide.click(function() { + $hide.closest('[rel=vlanRange]').remove(); }); + }, /**
