cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/master to 3db112f
Date Fri, 17 Oct 2014 21:59:01 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 248e4fbda -> 3db112f75


CLOUDSTACK-5576: UI > IP Address > EnableVPN, DisableVPN: change label.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3db112f7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3db112f7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3db112f7

Branch: refs/heads/master
Commit: 3db112f75c3e2391bce896c868095f3444e43451
Parents: 248e4fb
Author: Jessica Wang <jessicawang@apache.org>
Authored: Fri Oct 17 14:46:23 2014 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Fri Oct 17 14:58:51 2014 -0700

----------------------------------------------------------------------
 client/WEB-INF/classes/resources/messages.properties | 10 +++++-----
 ui/scripts/network.js                                |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3db112f7/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 a76855f..fb506d4 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -532,7 +532,7 @@ label.DHCP.server.type=DHCP Server Type
 label.dhcp=DHCP
 label.direct.ips=Shared Network IPs
 label.disable.provider=Disable provider
-label.disable.vpn=Disable VPN
+label.disable.vpn=Disable Remote Access VPN
 label.disabled=Disabled
 label.disabling.vpn.access=Disabling VPN Access
 label.disk.allocated=Disk Allocated
@@ -583,7 +583,7 @@ label.email=Email
 label.enable.provider=Enable provider
 label.enable.s3=Enable S3-backed Secondary Storage
 label.enable.swift=Enable Swift
-label.enable.vpn=Enable VPN
+label.enable.vpn=Enable Remote Access VPN
 label.enabling.vpn.access=Enabling VPN Access
 label.enabling.vpn=Enabling VPN
 label.end.IP=End IP
@@ -1780,7 +1780,7 @@ message.detach.iso.confirm=Please confirm that you want to detach the
ISO from t
 message.disable.account=Please confirm that you want to disable this account.  By disabling
the account, all users for this account will no longer have access to their cloud resources.
 All running virtual machines will be immediately shut down.
 message.disable.snapshot.policy=You have successfully disabled your current snapshot policy.
 message.disable.user=Please confirm that you would like to disable this user.
-message.disable.vpn.access=Please confirm that you want to disable VPN Access.
+message.disable.vpn.access=Please confirm that you want to disable Remote Access VPN.
 message.disable.vpn=Are you sure you want to disable VPN?
 message.download.ISO=Please click <a href\="\#">00000</a> to download ISO
 message.download.template=Please click <a href\="\#">00000</a> to download template
@@ -1793,9 +1793,9 @@ message.edit.traffic.type=Please specify the traffic label you want
associated w
 message.enable.account=Please confirm that you want to enable this account.
 message.enable.user=Please confirm that you would like to enable this user.
 message.enable.vpn.access=VPN is currently disabled for this IP Address.  Would you like
to enable VPN access?
-message.enable.vpn=Please confirm that you want VPN access enabled for this IP address.
+message.enable.vpn=Please confirm that you want Remote Access VPN enabled for this IP address.
 message.enabled.vpn.ip.sec=Your IPSec pre-shared key is
-message.enabled.vpn=Your VPN access is currently enabled and can be accessed via the IP
+message.enabled.vpn=Your Remote Access VPN is currently enabled and can be accessed via the
IP
 message.enabling.security.group.provider=Enabling Security Group provider
 message.enabling.zone=Enabling zone
 message.enter.token=Please enter the token that you were given in your invite e-mail.

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3db112f7/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 9d79d3f..d011083 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -2396,7 +2396,7 @@
                                     	if (args.vpn.state == "Running") {
                                     	    msg = _l('message.enabled.vpn') + ' ' + args.vpn.publicip
+ '.' + '<br/>' + _l('message.enabled.vpn.ip.sec') + '<br/>' + args.vpn.presharedkey;
                               	
                                     	} else {
-                                    		msg = "VPN configuration has been generated, but it
failed to apply. Please check connectivity of the network element, then re-try.";
+                                    		msg = "Remote Access VPN configuration has been generated,
but it failed to apply. Please check connectivity of the network element, then re-try.";
                                     	}   
                                         return msg;
                                     }


Mime
View raw message