incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [1/6] git commit: refs/heads/ui-multiple-vlan-ranges - Multiple Vlan Ranges UI development
Date Wed, 13 Feb 2013 23:18:02 GMT
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/d031129c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/d031129c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/d031129c

Branch: refs/heads/ui-multiple-vlan-ranges
Commit: d031129cb4043b6630450297452515e7e29e9152
Parents: 78ca6ce
Author: Pranav Saxena <pranav.saxena@citrix.com>
Authored: Tue Feb 5 13:31:58 2013 +0530
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Wed Feb 13 15:15:33 2013 -0800

----------------------------------------------------------------------
 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/d031129c/ui/css/cloudstack3.css
----------------------------------------------------------------------
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index efdae35..f68f87b 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -6923,6 +6923,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;
@@ -10453,6 +10459,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;
@@ -10659,6 +10668,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;
@@ -10692,6 +10717,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/d031129c/ui/scripts/ui-custom/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/zoneWizard.js b/ui/scripts/ui-custom/zoneWizard.js
index 718b454..eff5ccd 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'));
+
+       });
+
     },
 
     /**


Mime
View raw message