From 0cedb8b092a191b0048615e2ef3b8cd7088b4cba Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Wed, 27 Feb 2013 11:59:38 -0800 Subject: [PATCH] CLOUDSTACK-452: cloudstack UI - Infrastructure menu - zone detail - physical network - guest network - add IPv6 CIDR, IPv6 Gateway to listView and detailView. --- ui/scripts/system.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/ui/scripts/system.js b/ui/scripts/system.js index e51bf90ba81..80c73da3f7d 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' },