From e13d2dc2dc5b6f425758329bdb9bd02b66ac6b62 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 29 Sep 2011 15:11:26 -0700
Subject: [PATCH] bug 11570: cloudStack 2.2 - network page - add external load
 balancer dialog - add new field "mode" (side by side/inline).

---
 client/WEB-INF/classes/resources/messages.properties  |  4 ++++
 .../WEB-INF/classes/resources/messages_es.properties  |  4 ++++
 .../WEB-INF/classes/resources/messages_ja.properties  |  4 ++++
 .../classes/resources/messages_zh_CN.properties       |  4 ++++
 ui/jsp/network.jsp                                    | 11 +++++++++--
 ui/scripts/cloud.core.network.js                      |  3 +++
 6 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index ca5521085ea..936b634d653 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -4,6 +4,10 @@
 
 
 #Labels
+mode=Mode
+side.by.side=Side by Side
+inline=Inline
+
 extractable=Extractable
 
 label.ocfs2=OCFS2
diff --git a/client/WEB-INF/classes/resources/messages_es.properties b/client/WEB-INF/classes/resources/messages_es.properties
index 42e55348c7e..6c020c489df 100644
--- a/client/WEB-INF/classes/resources/messages_es.properties
+++ b/client/WEB-INF/classes/resources/messages_es.properties
@@ -4,6 +4,10 @@
 
 
 #Labels
+mode=modo
+side.by.side=Juntos
+inline=en línea
+
 extractable=extraíble
 
 label.ocfs2=OCFS2
diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties
index 7a3720bdaff..263a7135f49 100644
--- a/client/WEB-INF/classes/resources/messages_ja.properties
+++ b/client/WEB-INF/classes/resources/messages_ja.properties
@@ -4,6 +4,10 @@
 
 
 #Labels
+mode=モードの
+side.by.side=サイドからサイド
+inline=インライン
+
 extractable=抽出可能な
 
 label.ocfs2=OCFS2
diff --git a/client/WEB-INF/classes/resources/messages_zh_CN.properties b/client/WEB-INF/classes/resources/messages_zh_CN.properties
index a796055110b..28df33c4072 100644
--- a/client/WEB-INF/classes/resources/messages_zh_CN.properties
+++ b/client/WEB-INF/classes/resources/messages_zh_CN.properties
@@ -4,6 +4,10 @@
 
 
 #Labels
+mode=模式
+side.by.side=并排
+inline=内联
+
 extractable=萃取
 
 label.ocfs2=OCFS2
diff --git a/ui/jsp/network.jsp b/ui/jsp/network.jsp
index d97ff373223..cbfeb224225 100644
--- a/ui/jsp/network.jsp
+++ b/ui/jsp/network.jsp
@@ -1122,7 +1122,14 @@ dictionary = {
                 <div id="password_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>  
-            
+            <li>
+				<label>
+				    <fmt:message key="mode"/>:</label>
+				<select class="select" id="mode">						
+					<option value="false"><fmt:message key="side.by.side"/></option>
+					<option value="true"><fmt:message key="inline"/></option>
+				</select>
+			</li>        
             <li>
                 <label>
                     <fmt:message key="label.public.interface"/>:</label>
@@ -1143,7 +1150,7 @@ dictionary = {
                 <input class="text" type="text" id="numretries" />
                 <div id="numretries_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
-            </li>      
+            </li>   
         </ol>
         </form>
     </div>
diff --git a/ui/scripts/cloud.core.network.js b/ui/scripts/cloud.core.network.js
index f90e57ba687..bdf818b7ec8 100644
--- a/ui/scripts/cloud.core.network.js
+++ b/ui/scripts/cloud.core.network.js
@@ -939,6 +939,9 @@ function bindAddLoadBalancerButton() {
 				var password = $thisDialog.find("#password").val();
 				array1.push("&password=" + todb(password));
 				
+				var isInline = $thisDialog.find("#mode").val();
+				array1.push("&inline=" + isInline);
+								
 				//*** construct URL (begin)	***	
 				var url = [];