Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 62D93EBCE for ; Thu, 28 Feb 2013 14:56:12 +0000 (UTC) Received: (qmail 32758 invoked by uid 500); 28 Feb 2013 14:56:10 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 31820 invoked by uid 500); 28 Feb 2013 14:56:06 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 30804 invoked by uid 99); 28 Feb 2013 14:56:04 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Feb 2013 14:56:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A740510DB3; Thu, 28 Feb 2013 14:56:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: noa@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [2/20] git commit: refs/heads/noa/packaging_rpm_fixes - CLOUDSTACK-452: cloudstack UI - Infrastructure menu - zone detail - physical network - guest network - add IPv6 CIDR, IPv6 Gateway to listView and detailView. Message-Id: <20130228145603.A740510DB3@tyr.zones.apache.org> Date: Thu, 28 Feb 2013 14:56:03 +0000 (UTC) CLOUDSTACK-452: cloudstack UI - Infrastructure menu - zone detail - physical network - guest network - add IPv6 CIDR, IPv6 Gateway to listView and detailView. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/0cedb8b0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/0cedb8b0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/0cedb8b0 Branch: refs/heads/noa/packaging_rpm_fixes Commit: 0cedb8b092a191b0048615e2ef3b8cd7088b4cba Parents: e2a16a1 Author: Jessica Wang Authored: Wed Feb 27 11:59:38 2013 -0800 Committer: Jessica Wang Committed: Wed Feb 27 12:03:05 2013 -0800 ---------------------------------------------------------------------- ui/scripts/system.js | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0cedb8b0/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index e51bf90..80c73da 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -1104,8 +1104,9 @@ name: { label: 'label.name' }, type: { label: 'label.type' }, vlan: { label: 'label.vlan.id' }, - cidr: { label: 'label.cidr' }, - scope: { label: 'label.scope' } + cidr: { label: 'IPv4 CIDR' }, + ip6cidr: { label: 'IPv6 CIDR'} + //scope: { label: 'label.scope' } }, actions: { add: { @@ -1841,9 +1842,13 @@ label: 'label.network.offering.id' }, - gateway: { label: 'label.gateway' }, + gateway: { label: 'IPv4 Gateway' }, //netmask: { label: 'label.netmask' }, - cidr: { label: 'label.cidr' }, + cidr: { label: 'IPv4 CIDR' }, + + ip6gateway: { label: 'IPv6 Gateway' }, + ip6cidr: { label: 'IPv6 CIDR' }, + networkdomaintext: { label: 'label.network.domain' },