Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DC75E10B90 for ; Wed, 26 Nov 2014 18:37:14 +0000 (UTC) Received: (qmail 24503 invoked by uid 500); 26 Nov 2014 18:37:14 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 24413 invoked by uid 500); 26 Nov 2014 18:37:14 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 23445 invoked by uid 99); 26 Nov 2014 18:37:14 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Nov 2014 18:37:14 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 065F68AF0FD; Wed, 26 Nov 2014 18:37:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Date: Wed, 26 Nov 2014 18:37:21 -0000 Message-Id: <2dc5de82133f436da196f58550347f5a@git.apache.org> In-Reply-To: <038df3bd4bd547069897a2a09115109d@git.apache.org> References: <038df3bd4bd547069897a2a09115109d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/12] git commit: updated refs/heads/4.3 to 8de4894 CLOUDSTACK-5576: UI > IP Address > EnableVPN, DisableVPN: change label. (cherry picked from commit e796d418b4ff7d3644bcc962b796d929b3d7baf7) Signed-off-by: Rohit Yadav 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/6cd4b289 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6cd4b289 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6cd4b289 Branch: refs/heads/4.3 Commit: 6cd4b289b2d73359152a4bf53b74edee8e725384 Parents: bce07b6 Author: Jessica Wang Authored: Fri Oct 17 14:46:23 2014 -0700 Committer: Rohit Yadav Committed: Wed Nov 26 23:31:25 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/6cd4b289/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 1af9b30..c6ab351 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -522,7 +522,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 @@ -572,7 +572,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 @@ -1436,7 +1436,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 00000 to download ISO message.download.template=Please click 00000 to download template @@ -1449,9 +1449,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/6cd4b289/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 511ad41..9d3b6ae 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -2275,7 +2275,13 @@ return 'label.enable.vpn'; }, complete: function(args) { - return _l('message.enabled.vpn') + ' ' + args.remoteaccessvpn.publicip + '.' + '
' + _l('message.enabled.vpn.ip.sec') + '
' + args.remoteaccessvpn.presharedkey; + var msg; + if (args.vpn.state == "Running") { + msg = _l('message.enabled.vpn') + ' ' + args.remoteaccessvpn.publicip + '.' + '
' + _l('message.enabled.vpn.ip.sec') + '
' + 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: {