From 0b1b8adf30481fa2ebe88ee323a88c78ba183bf9 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica.wang@citrix.com>
Date: Thu, 2 Aug 2012 11:13:42 -0700
Subject: [PATCH] cloudstack 3.0 UI - site to site VPN - VPN customer gateway -
 add name field.

---
 ui/scripts/network.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 6cfcf7e6960..2bd662f8c3b 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -3895,6 +3895,7 @@
           id: 'vpnCustomerGateway',
           label: 'VPN Customer Gateway',
           fields: {
+					  name: { label: 'label.name' },
             gateway: { label: 'label.gateway' },
             cidrlist: { label: 'CIDR list' },
             ipsecpsk: { label: 'IPsec Preshared-Key' }
@@ -3934,6 +3935,10 @@
               createForm: {
                 title: 'add VPN Customer Gateway',
                 fields: {
+								  name: {
+									  label: 'label.name',
+										validation: { required: true }
+									},
                   gateway: {
                     label: 'label.gateway',
                     validation: { required: true }
@@ -3986,6 +3991,7 @@
                 $.ajax({
                   url: createURL('createVpnCustomerGateway'),
                   data: {
+									  name: args.data.name,
                     gateway: args.data.gateway,
                     cidrlist: args.data.cidrlist,
                     ipsecpsk: args.data.ipsecpsk,
@@ -4023,7 +4029,7 @@
                 label: 'Create VPN Connection',
                 messages: {
                   confirm: function(args) {
-                    return 'Are you sure you want to create VPN connection ?';
+                    return 'Please confirm that you want to create VPN connection.';
                   },
                   notification: function(args) {
                     return 'Create VPN Connection';
@@ -4204,9 +4210,10 @@
                 title: 'label.details',
                 fields: [
                   {
-                    gateway: { label: 'label.gateway' }
+									  name: { label: 'label.name' }                    
                   },
                   {
+									  gateway: { label: 'label.gateway' },
                     cidrlist: { label: 'CIDR list' },
                     ipsecpsk: { label: 'IPsec Preshared-Key' },
                     id: { label: 'label.id' },