You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2013/11/04 23:25:12 UTC
git commit: updated refs/heads/master to 5ccf3a9
Updated Branches:
refs/heads/master 9a62239a9 -> 5ccf3a90a
switch label for VLAN to VLAN/VNI
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5ccf3a90
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5ccf3a90
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5ccf3a90
Branch: refs/heads/master
Commit: 5ccf3a90abb79eace839a8e61cf950248aa913c8
Parents: 9a62239
Author: chriscameronv <ch...@contractor.verio.net>
Authored: Wed Oct 30 14:44:56 2013 -0600
Committer: Jessica Wang <je...@apache.org>
Committed: Mon Nov 4 14:25:01 2013 -0800
----------------------------------------------------------------------
.../WEB-INF/classes/resources/messages.properties | 8 +++++---
ui/dictionary.jsp | 2 ++
ui/scripts/network.js | 2 +-
ui/scripts/system.js | 16 ++++++++--------
4 files changed, 16 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ccf3a90/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 12d2a11..d548527 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -1176,9 +1176,11 @@ label.virtual.machines=Virtual machines
label.virtual.network=Virtual Network
label.virtual.router=Virtual Router
label.virtual.routers=Virtual Routers
-label.vlan.id=VLAN ID
-label.vlan.range=VLAN Range
-label.vlan=VLAN
+label.vlan.id=VLAN/VNI ID
+label.vlan.range=VLAN/VNI Range
+label.vlan=VLAN/VNI
+label.vnet=VLAN/VNI
+label.vnet.id=VLAN/VNI ID
label.vxlan.id=VXLAN ID
label.vxlan.range=VXLAN Range
label.vxlan=VXLAN
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ccf3a90/ui/dictionary.jsp
----------------------------------------------------------------------
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index 1bf0eab..ed269c8 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -1133,6 +1133,8 @@ dictionary = {
'label.use.vm.ip': '<fmt:message key="label.use.vm.ip" />',
'label.value': '<fmt:message key="label.value" />',
'label.vcdcname': '<fmt:message key="label.vcdcname" />',
+'label.vnet': '<fmt:message key="label.vnet" />',
+'label.vnet.id': '<fmt:message key="label.vnet.id" />',
'label.vcenter.cluster': '<fmt:message key="label.vcenter.cluster" />',
'label.vcenter.datacenter': '<fmt:message key="label.vcenter.datacenter" />',
'label.vcenter.datastore': '<fmt:message key="label.vcenter.datastore" />',
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ccf3a90/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 708b2f1..4196b10 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -1151,7 +1151,7 @@
}
},
vlan: {
- label: 'label.vlan.id'
+ label: 'label.vnet.id'
},
broadcasturi: {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ccf3a90/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index c07f5f7..1595948 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -1152,7 +1152,7 @@
label: 'label.state'
},
vlan: {
- label: 'VLAN Range(s)',
+ label: 'VLAN/VNI Range(s)',
isEditable: true
},
tags: {
@@ -1384,7 +1384,7 @@
label: 'label.type'
},
vlan: {
- label: 'label.vlan.id'
+ label: 'label.vnet.id'
},
broadcasturi: {
label: 'broadcast URI'
@@ -1820,13 +1820,13 @@
},
dedicatedGuestVlanRanges: {
- title: 'Dedicated VLAN Ranges',
+ title: 'Dedicated VLAN/VNI Ranges',
listView: {
section: 'dedicatedGuestVlanRanges',
id: 'dedicatedGuestVlanRanges',
fields: {
guestvlanrange: {
- label: 'VLAN Range(s)'
+ label: 'VLAN/VNI Range(s)'
},
domain: {
label: 'label.domain'
@@ -1851,17 +1851,17 @@
},
actions: {
add: {
- label: 'Dedicate VLAN Range',
+ label: 'Dedicate VLAN/VNI Range',
messages: {
notification: function(args) {
- return 'Dedicate VLAN Range';
+ return 'Dedicate VLAN/VNI Range';
}
},
createForm: {
- title: 'Dedicate VLAN Range',
+ title: 'Dedicate VLAN/VNI Range',
fields: {
vlanrange: {
- label: 'VLAN Range',
+ label: 'VLAN/VNI Range',
/* select: function(args) {
var items = [];
if(args.context.physicalNetworks[0].vlan != null && args.context.physicalNetworks[0].vlan.length > 0) {