apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

switch label for VLAN to VLAN/VNI

Browse Source
This commit is contained in:
chriscameronv 2013-10-30 14:44:56 -06:00 committed by Jessica Wang
parent 9a62239a92
commit 5ccf3a90ab
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/WEB-INF/classes/resources/messages.properties
View File

@ -1176,9 +1176,11 @@ label.virtual.machines=Virtual machines
label.virtual.network=Virtual Network label.virtual.network=Virtual Network
label.virtual.router=Virtual Router label.virtual.router=Virtual Router
label.virtual.routers=Virtual Routers label.virtual.routers=Virtual Routers
label.vlan.id=VLAN ID label.vlan.id=VLAN/VNI ID
label.vlan.range=VLAN Range label.vlan.range=VLAN/VNI Range
label.vlan=VLAN label.vlan=VLAN/VNI
label.vnet=VLAN/VNI
label.vnet.id=VLAN/VNI ID
label.vxlan.id=VXLAN ID label.vxlan.id=VXLAN ID
label.vxlan.range=VXLAN Range label.vxlan.range=VXLAN Range
label.vxlan=VXLAN label.vxlan=VXLAN

2
ui/dictionary.jsp
View File

@ -1133,6 +1133,8 @@ dictionary = {
'label.use.vm.ip': '<fmt:message key="label.use.vm.ip" />', 'label.use.vm.ip': '<fmt:message key="label.use.vm.ip" />',
'label.value': '<fmt:message key="label.value" />', 'label.value': '<fmt:message key="label.value" />',
'label.vcdcname': '<fmt:message key="label.vcdcname" />', '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.cluster': '<fmt:message key="label.vcenter.cluster" />',
'label.vcenter.datacenter': '<fmt:message key="label.vcenter.datacenter" />', 'label.vcenter.datacenter': '<fmt:message key="label.vcenter.datacenter" />',
'label.vcenter.datastore': '<fmt:message key="label.vcenter.datastore" />', 'label.vcenter.datastore': '<fmt:message key="label.vcenter.datastore" />',

2
ui/scripts/network.js
View File

@ -1151,7 +1151,7 @@
} }
}, },
vlan: { vlan: {
label: 'label.vlan.id' label: 'label.vnet.id'
}, },
broadcasturi: { broadcasturi: {

16
ui/scripts/system.js
View File

@ -1152,7 +1152,7 @@
label: 'label.state' label: 'label.state'
}, },
vlan: { vlan: {
label: 'VLAN Range(s)', label: 'VLAN/VNI Range(s)',
isEditable: true isEditable: true
}, },
tags: { tags: {
@ -1384,7 +1384,7 @@
label: 'label.type' label: 'label.type'
}, },
vlan: { vlan: {
label: 'label.vlan.id' label: 'label.vnet.id'
}, },
broadcasturi: { broadcasturi: {
label: 'broadcast URI' label: 'broadcast URI'
@ -1820,13 +1820,13 @@
}, },
dedicatedGuestVlanRanges: { dedicatedGuestVlanRanges: {
title: 'Dedicated VLAN Ranges', title: 'Dedicated VLAN/VNI Ranges',
listView: { listView: {
section: 'dedicatedGuestVlanRanges', section: 'dedicatedGuestVlanRanges',
id: 'dedicatedGuestVlanRanges', id: 'dedicatedGuestVlanRanges',
fields: { fields: {
guestvlanrange: { guestvlanrange: {
label: 'VLAN Range(s)' label: 'VLAN/VNI Range(s)'
}, },
domain: { domain: {
label: 'label.domain' label: 'label.domain'
@ -1851,17 +1851,17 @@
}, },
actions: { actions: {
add: { add: {
label: 'Dedicate VLAN Range', label: 'Dedicate VLAN/VNI Range',
messages: { messages: {
notification: function(args) { notification: function(args) {
return 'Dedicate VLAN Range'; return 'Dedicate VLAN/VNI Range';
} }
}, },
createForm: { createForm: {
title: 'Dedicate VLAN Range', title: 'Dedicate VLAN/VNI Range',
fields: { fields: {
vlanrange: { vlanrange: {
label: 'VLAN Range', label: 'VLAN/VNI Range',
/* select: function(args) { /* select: function(args) {
var items = []; var items = [];
if(args.context.physicalNetworks[0].vlan != null && args.context.physicalNetworks[0].vlan.length > 0) { if(args.context.physicalNetworks[0].vlan != null && args.context.physicalNetworks[0].vlan.length > 0) {