You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2012/11/06 01:07:29 UTC
[7/9] git commit: Fix capitalization of 'Site-to-site VPN'
Fix capitalization of 'Site-to-site VPN'
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c91bde7d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c91bde7d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c91bde7d
Branch: refs/heads/master
Commit: c91bde7d4bdef6f8c02a94adbe7dc70aa5d83e34
Parents: becd611
Author: Brian Federle <br...@citrix.com>
Authored: Mon Nov 5 15:12:18 2012 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Mon Nov 5 15:42:10 2012 -0800
----------------------------------------------------------------------
.../WEB-INF/classes/resources/messages.properties | 2 +-
ui/scripts/network.js | 86 +++++++--------
2 files changed, 43 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c91bde7d/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index ce76a84..71f8194 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -30,6 +30,7 @@ label.broadcast.uri=Broadcast URI
#modified labels (begin) *****************************************************************************************
+label.site.to.site.VPN=Site-to-site VPN
message.zoneWizard.enable.local.storage=WARNING: If you enable local storage for this zone, you must do the following, depending on where you would like your system VMs to launch:<br/><br/>1. If system VMs need to be launched in primary storage, primary storage needs to be added to the zone after creation. You must also start the zone in a disabled state.<br/><br/>2. If system VMs need to be launched in local storage, system.vm.use.local.storage needs to be set to true before you enable the zone.<br/><br/><br/>Would you like to continue?
#modified labels (end) *******************************************************************************************
@@ -61,7 +62,6 @@ label.CIDR.of.destination.network=CIDR of destination network
label.add.route=Add route
label.add.static.route=Add static route
label.remove.static.route=Remove static route
-label.site.to.site.VPN=site-to-site VPN
label.add.VPN.gateway=Add VPN Gateway
message.add.VPN.gateway=Please confirm that you want to add a VPN Gateway
label.VPN.gateway=VPN Gateway
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c91bde7d/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index a149bfa..be362ff 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -4030,52 +4030,50 @@
});
}
},
-
- router: {
- title: 'VPC Router Details',
- fields:[
- {
- name: {label:'label.name'}
- },
- {
- id:{ label:'label.id'},
- zonename: { label: 'label.zone'},
- dns1: {label: 'label.dns'},
- gateway: {label:'label.gateway'},
- publicip: {label: 'label.public.ip'},
- guestipaddress:{ label: 'label.guest.ip'},
- linklocalip: {label: 'label.linklocal.ip'},
- state: { label:'label.state'},
- serviceofferingname: {label:'label.service.offering'},
- isredundantrouter:{
- label: 'label.redundant.router',
- converter: function(booleanValue) {
- if (booleanValue == true) {
- return "<font color='red'>Yes</font>";
- }
- return "No";
- }
- },
- account: {label:'label.account'},
- domain: {label: 'label.domain'}
+ router: {
+ title: 'VPC Router Details',
+ fields:[
+ {
+ name: {label:'label.name'}
+ },
+ {
+ id:{ label:'label.id'},
+ zonename: { label: 'label.zone'},
+ dns1: {label: 'label.dns'},
+ gateway: {label:'label.gateway'},
+ publicip: {label: 'label.public.ip'},
+ guestipaddress:{ label: 'label.guest.ip'},
+ linklocalip: {label: 'label.linklocal.ip'},
+ state: { label:'label.state'},
+ serviceofferingname: {label:'label.service.offering'},
+ isredundantrouter:{
+ label: 'label.redundant.router',
+ converter: function(booleanValue) {
+ if (booleanValue == true) {
+ return "<font color='red'>Yes</font>";
}
- ],
- dataProvider: function(args) {
- $.ajax ({
- url:createURL("listRouters&listAll=true&vpcid=" +args.context.vpc[0].id),
- dataType: "json",
- async: true,
- success:function(json) {
- var item = json.listroutersresponse.router[0];
- args.response.success ({
- data:item
- })
- }
-
- });
- }
-
+ return "No";
+ }
+ },
+ account: {label:'label.account'},
+ domain: {label: 'label.domain'}
+ }
+ ],
+ dataProvider: function(args) {
+ $.ajax({
+ url: createURL("listRouters&listAll=true&vpcid=" +args.context.vpc[0].id),
+ dataType: "json",
+ async: true,
+ success: function(json) {
+ var item = json.listroutersresponse.router[0];
+
+ args.response.success({
+ data:item
+ });
}
+ });
+ }
+ }
}
}
}