Revert "CLOUDSTACK-452: cloudstack UI - network menu - create guest network dialog - add IPv6 Gateway field and rename original Guest Gateway to IPv4 Gateway."
This reverts commit ba0d8c67bc4fa0a9f6988bc47f97a2408e845c86. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/cd888ddb Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/cd888ddb Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/cd888ddb Branch: refs/heads/noa/packaging_rpm_fixes Commit: cd888ddb5b0cc58a8fd6c4735e522d9f25ccdc55 Parents: 0cedb8b Author: Jessica Wang <[email protected]> Authored: Wed Feb 27 12:04:18 2013 -0800 Committer: Jessica Wang <[email protected]> Committed: Wed Feb 27 12:04:18 2013 -0800 ---------------------------------------------------------------------- ui/scripts/network.js | 31 +++++++++++-------------------- 1 files changed, 11 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cd888ddb/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 57dcdb8..a6184e3 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -441,10 +441,8 @@ } }, - ip4gateway: { label: 'IPv4 Gateway', docID: 'helpGuestNetworkGateway' }, - ip6gateway: { label: 'IPv6 Gateway' }, - - ip4netmask: { label: 'Netmask', docID: 'helpGuestNetworkNetmask' }, + guestGateway: { label: 'label.guest.gateway', docID: 'helpGuestNetworkGateway' }, + guestNetmask: { label: 'label.guest.netmask', docID: 'helpGuestNetworkNetmask' }, networkDomain: { label: 'label.network.domain' } } }, @@ -456,20 +454,14 @@ networkOfferingId: args.data.networkOfferingId }; - if(args.data.ip4gateway != null && args.data.ip4gateway.length > 0) { - $.extend(dataObj, { - gateway: args.data.ip4gateway - }); - } - if(args.data.ip6gateway != null && args.data.ip6gateway.length > 0) { + if(args.data.guestGateway != null && args.data.guestGateway.length > 0) { $.extend(dataObj, { - ip6gateway: args.data.ip6gateway + gateway: args.data.guestGateway }); - } - - if(args.data.ip4netmask != null && args.data.ip4netmask.length > 0) { + } + if(args.data.guestNetmask != null && args.data.guestNetmask.length > 0) { $.extend(dataObj, { - netmask: args.data.ip4netmask + netmask: args.data.guestNetmask }); } if(args.$form.find('.form-item[rel=vpcid]').css("display") != "none") { @@ -504,10 +496,9 @@ id: 'networks', fields: { name: { label: 'label.name' }, - //account: { label: 'label.account' }, + account: { label: 'label.account' }, type: { label: 'label.type' }, - cidr: { label: 'IPv4 CIDR' }, - ip6cidr: { label: 'IPv6 CIDR' } + cidr: { label: 'label.cidr' } }, advSearchFields: { @@ -1010,11 +1001,11 @@ } }, - gateway: { label: 'IPv4 Gateway' }, + gateway: { label: 'label.gateway' }, ip6gateway: { label: 'IPv6 Gateway' }, //netmask: { label: 'label.netmask' }, - cidr: { label: 'IPv4 CIDR' }, + cidr: { label: 'label.cidr' }, ip6cidr: { label: 'IPv6 CIDR' }, networkdomaintext: {
