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/02/28 21:04:47 UTC
git commit: refs/heads/master - CLOUDSTACK-452: cloudstack UI -
Infrastructure menu - zone detail - physical network - guest network - add
IPv6 CIDR, IPv6 Gateway to listView and detailView.
Updated Branches:
refs/heads/master 5477d096d -> 3f876060c
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/3f876060
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/3f876060
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/3f876060
Branch: refs/heads/master
Commit: 3f876060c0b1c62a8f36be494891141fc8620fa0
Parents: 5477d09
Author: Jessica Wang <je...@apache.org>
Authored: Wed Feb 27 11:59:38 2013 -0800
Committer: Jessica Wang <je...@apache.org>
Committed: Thu Feb 28 12:04:15 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/3f876060/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index d5c2a4c..ce2d737 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'
},