Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EE9BD10215 for ; Mon, 4 Nov 2013 22:36:10 +0000 (UTC) Received: (qmail 5302 invoked by uid 500); 4 Nov 2013 22:36:10 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 5224 invoked by uid 500); 4 Nov 2013 22:36:10 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 5022 invoked by uid 99); 4 Nov 2013 22:36:10 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Nov 2013 22:36:10 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2BA643D67E; Mon, 4 Nov 2013 22:36:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bfederle@apache.org To: commits@cloudstack.apache.org Date: Mon, 04 Nov 2013 22:36:18 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/12] git commit: updated refs/heads/ui-restyle to d0e8fa3 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/ui-restyle Commit: 5ccf3a90abb79eace839a8e61cf950248aa913c8 Parents: 9a62239 Author: chriscameronv Authored: Wed Oct 30 14:44:56 2013 -0600 Committer: Jessica Wang 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': '', 'label.value': '', 'label.vcdcname': '', +'label.vnet': '', +'label.vnet.id': '', 'label.vcenter.cluster': '', 'label.vcenter.datacenter': '', '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) {