incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n..@apache.org
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.
Date Thu, 28 Feb 2013 14:56:03 GMT
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 <jessicawang@apache.org>
Authored: Wed Feb 27 11:59:38 2013 -0800
Committer: Jessica Wang <jessicawang@apache.org>
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'
                             },


Mime
View raw message