From e883526449398daa3bc386460c5f6c79007ed939 Mon Sep 17 00:00:00 2001
From: Brian Federle <bfederle@gmail.com>
Date: Tue, 4 Jun 2013 15:25:50 -0700
Subject: [PATCH] CLOUDSTACK-1763: Better confirm message for acquire NIC IP

---
 client/WEB-INF/classes/resources/messages.properties | 1 +
 ui/css/cloudstack3.css                               | 4 ++++
 ui/dictionary.jsp                                    | 1 +
 ui/scripts/network.js                                | 2 +-
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index ce20fa49f1c..0de4cfff7d0 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+message.acquire.ip.nic=Please confirm that you would like to acquire a new secondary IP for this NIC.<br/>NOTE: You need to manually configure the newly-acquired secondary IP inside the virtual machine.
 message.select.affinity.groups=Please select any affinity groups you want this VM to belong to:
 message.no.affinity.groups=You do not have any affinity groups. Please continue to the next step.
 label.action.delete.nic=Remove NIC
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 0514586d1bf..c2d0526910c 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -3748,6 +3748,10 @@ Dialogs*/
   font-size: 15px;
 }
 
+.ui-dialog div.form-container span.message br {
+  margin-bottom: 13px;
+}
+
 .ui-dialog div.form-container div.form-item {
   width: 100%;
   display: inline-block;
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index d7f7dd58d63..e1f9a30d5d4 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -25,6 +25,7 @@ under the License.
 <% long now = System.currentTimeMillis(); %>
 <script language="javascript">
 dictionary = {
+'message.acquire.ip.nic': '<fmt:message key="message.acquire.ip.nic" />',
 'message.select.affinity.groups': '<fmt:message key="message.select.affinity.groups" />',
 'message.no.affinity.groups': '<fmt:message key="message.no.affinity.groups" />',
 'label.action.delete.nic': '<fmt:message key="label.action.delete.nic" />',
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index f7d3ea43973..6ab15c320ad 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -1551,7 +1551,7 @@
               addRow: 'true',
               createForm: {
                 title: 'label.acquire.new.ip',
-                desc: 'message.acquire.new.ip',
+                desc: 'message.acquire.ip.nic',
                 fields: {
                   ipaddr: { label: 'label.ip.address' }
                 }