dvswitch UI minor enhancements
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/fc64ee57 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/fc64ee57 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/fc64ee57 Branch: refs/heads/ui-multiple-nics Commit: fc64ee57a37d9861f10c40cfac45d195d4026ddd Parents: aedb8c4 Author: Pranav Saxena <[email protected]> Authored: Mon Mar 4 14:39:22 2013 +0530 Committer: Pranav Saxena <[email protected]> Committed: Mon Mar 4 14:39:22 2013 +0530 ---------------------------------------------------------------------- ui/scripts/system.js | 17 +++++------------ ui/scripts/zoneWizard.js | 16 ++++++---------- 2 files changed, 11 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc64ee57/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index d1bd9c5..ac8fe3d 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -7598,7 +7598,6 @@ if(vSwitchEnabled) { items.push({ id:" nexusdvs" , description: "Cisco Nexus 1000v Distributed Virtual Switch"}); - items.push({id: "vmwaresvs", description: "VMware vNetwork Standard Virtual Switch"}); items.push({id: "vmwaredvs", description: "VMware vNetwork Distributed Virtual Switch"}); @@ -7609,10 +7608,8 @@ // items.push({id: "" , description:" " }); else{ - items.push({id: "vmwaresvs", description: "VMware vNetwork Standard Virtual Switch"}); items.push({id: "vmwaredvs", description: "VMware vNetwork Distributed Virtual Switch"}); - - + items.push({id: "vmwaresvs", description: "VMware vNetwork Standard Virtual Switch"}); items.push({ id:" nexusdvs" , description: "Cisco Nexus 1000v Distributed Virtual Switch"}); } @@ -7662,21 +7659,17 @@ if(vSwitchEnabled){ - items.push({ id:" nexusdvs" , description: "Cisco Nexus 1000v Distributed Virtual Switch"}); - + items.push({ id:"nexusdvs" , description: "Cisco Nexus 1000v Distributed Virtual Switch"}); items.push({id: "vmwaresvs", description: "VMware vNetwork Standard Virtual Switch"}); items.push({id: "vmwaredvs", description: "VMware vNetwork Distributed Virtual Switch"}); - } else{ - - items.push({id: "vmwaresvs", description: "VMware vNetwork Standard Virtual Switch"}); - items.push({id: "vmwaredvs", description: "VMware vNetwork Distributed Virtual Switch"}); - - items.push({ id:" nexusdvs" , description: "Cisco Nexus 1000v Distributed Virtual Switch"}); + items.push({id: "vmwaredvs", description: "VMware vNetwork Distributed Virtual Switch"}); + items.push({id: "vmwaresvs", description: "VMware vNetwork Standard Virtual Switch"}); + items.push({ id:"nexusdvs" , description: "Cisco Nexus 1000v Distributed Virtual Switch"}); } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc64ee57/ui/scripts/zoneWizard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index d8684fb..4793266 100755 --- a/ui/scripts/zoneWizard.js +++ b/ui/scripts/zoneWizard.js @@ -909,10 +909,8 @@ // items.push({id: " ", description: " "}); else{ + items.push({id: "vmwaredvs", description: "VMware vNetwork Distributed Virtual Switch"}); items.push({id: "vmwaresvs", description: "VMware vNetwork Standard Virtual Switch"}); - items.push({id: "vmwaredvs", description: "VMware vNetwork Distributed Virtual Switch"}); - - items.push({ id:" nexusdvs" , description: "Cisco Nexus 1000v Distributed Virtual Switch"}); } @@ -923,7 +921,7 @@ }, vSwitchPublicName:{ - label:'vSwitch Public Traffic Name', + label:'Public Traffic vSwitch Name', dependsOn:'overridepublictraffic', isHidden:true @@ -961,8 +959,7 @@ if(vSwitchEnabled) { - items.push({ id:" nexusdvs" , description: "Cisco Nexus 1000v Distributed Virtual Switch"}); - + items.push({ id:"nexusdvs" , description: "Cisco Nexus 1000v Distributed Virtual Switch"}); items.push({id: "vmwaresvs", description: "VMware vNetwork Standard Virtual Switch"}); items.push({id: "vmwaredvs", description: "VMware vNetwork Distributed Virtual Switch"}); @@ -972,10 +969,9 @@ } else{ - items.push({id: "vmwaresvs", description: "VMware vNetwork Standard Virtual Switch"}); items.push({id: "vmwaredvs", description: "VMware vNetwork Distributed Virtual Switch"}); - - items.push({ id:" nexusdvs" , description: "Cisco Nexus 1000v Distributed Virtual Switch"}); + items.push({id: "vmwaresvs", description: "VMware vNetwork Standard Virtual Switch"}); + items.push({ id:"nexusdvs" , description: "Cisco Nexus 1000v Distributed Virtual Switch"}); } args.response.success({data: items}); @@ -986,7 +982,7 @@ }, vSwitchGuestName:{ - label:'vSwitch Guest Traffic Name', + label:'Guest Traffic vSwitch Name', dependsOn:'overrideguesttraffic', isHidden:true
