cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [36/41] git commit: updated refs/heads/4.4 to 010a217
Date Thu, 11 Dec 2014 16:54:16 GMT
CLOUDSTACK-5576: UI > IP Address > EnableVPN, DisableVPN: change label.

(cherry picked from commit e796d418b4ff7d3644bcc962b796d929b3d7baf7)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	ui/scripts/network.js

Conflicts:
	ui/scripts/network.js


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

Branch: refs/heads/4.4
Commit: 5e5d830635db3ffcceb82239a7ca3d3afc41f7af
Parents: 7da55df
Author: Jessica Wang <jessicawang@apache.org>
Authored: Fri Oct 17 14:46:23 2014 -0700
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Thu Dec 11 20:51:56 2014 +0530

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5e5d8306/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 fec0c6d..42787be 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -525,7 +525,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
@@ -575,7 +575,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
@@ -1674,7 +1674,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
@@ -1687,9 +1687,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/5e5d8306/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index b69d43b..cdea04c 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -2385,7 +2385,13 @@
                                         return 'label.enable.vpn';
                                     },
                                     complete: function(args) {
-                                        return _l('message.enabled.vpn') + ' ' + args.vpn.publicip
+ '.' + '<br/>' + _l('message.enabled.vpn.ip.sec') + '<br/>' + args.vpn.presharedkey;
+                                        var msg;
+                                        if (args.vpn.state == "Running") {
+                                            msg = _l('message.enabled.vpn') + ' ' + args.remoteaccessvpn.publicip
+ '.' + '<br/>' + _l('message.enabled.vpn.ip.sec') + '<br/>' + args.remoteaccessvpn.presharedkey;
+                                        } else {
+                                            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;
                                     }
                                 },
                                 notification: {


Mime
View raw message