From ce1f4fa79979581916cf370c0c9cb8e3aa63da9b Mon Sep 17 00:00:00 2001
From: will <will@cloud.com>
Date: Fri, 5 Nov 2010 12:52:43 -0700
Subject: [PATCH] bug 7020: Enabling VPN will allow you to see the IP and
 pre-shared key you are suppose to use to connect to the vpn itself.

status 7020: resolved fixed
---
 ui/css/main.css                    | 5 +++--
 ui/jsp/ipaddress.jsp               | 6 ++++++
 ui/scripts/cloud.core.ipaddress.js | 5 +++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ui/css/main.css b/ui/css/main.css
index 7e69f7d6e41..d3090026960 100644
--- a/ui/css/main.css
+++ b/ui/css/main.css
@@ -2908,8 +2908,9 @@ a:hover.search_button {
 }
 
 .info_detailbox.defaultbox {
-	background:FFF repeat-x top left;
-	color:#a90000;
+	background:#eaf2f6 repeat-x top left;
+	color:#333;
+	margin-top:10px;
 }
 
 
diff --git a/ui/jsp/ipaddress.jsp b/ui/jsp/ipaddress.jsp
index f2d83b21b0b..fefc7449105 100644
--- a/ui/jsp/ipaddress.jsp
+++ b/ui/jsp/ipaddress.jsp
@@ -284,6 +284,12 @@
             </div>
         </div>        
         <div id="tab_container" style="display:none">
+			<div id="vpn_help" class="info_detailbox defaultbox" style="display:none;"> 
+				<p>
+					Your VPN access is currently enabled and can be accessed via the IP : <b><span id="vpn_ip"></span></b><br/>
+					Your IPSec pre-shared key is : <b><span id="vpn_key"></span></b><br/>
+				</p>
+			</div>
 			<div class="grid_container">
 	        	<div class="grid_header">
 	            	<div id="grid_header_title" class="grid_header_title">VPN Users</div>
diff --git a/ui/scripts/cloud.core.ipaddress.js b/ui/scripts/cloud.core.ipaddress.js
index 7950d62c2dc..8c3eddfbc73 100644
--- a/ui/scripts/cloud.core.ipaddress.js
+++ b/ui/scripts/cloud.core.ipaddress.js
@@ -388,6 +388,8 @@ function ipJsonToVPNTab() {
         success: function(json) {		                    
             var items = json.listremoteaccessvpnsresponse.remoteaccessvpn;  
             if (items != null && items.length > 0) {
+				$thisTab.find("#vpn_key").text(items[0].presharedkey);
+				$thisTab.find("#vpn_ip").text(items[0].publicip);
 				showVpnUsers();
             } else {
 				showEnableVPNDialog($thisTab);
@@ -439,6 +441,7 @@ function showVpnUsers() {
 																																		 
 											if (result.jobstatus == 1) { // Succeeded 	
 												$thisDialog.dialog("close");
+												$vpnTab.find("#vpn_help").hide();
 												$vpnTab.find("#enable_vpn_link").unbind("click").bind("click", function(event) {
 													showEnableVPNDialog($vpnTab);
 												});
@@ -552,6 +555,8 @@ function showVpnUsers() {
 		return false;
 	});		
 	
+	$vpnTab.find("#vpn_help").show();
+	
 	// List users
 	$.ajax({
         data: createURL("command=listVpnUsers&account="+ipObj.account+"&domainid="+ipObj.domainid),