From 9eabe886e512b1a0c1824ef07fe2ea4cb660d3b4 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 10 Aug 2011 12:24:06 -0700
Subject: [PATCH] cloudStack - IP Address page - Load Balancer tab - remove
 Source CIDR.

---
 ui/jsp/ipaddress.jsp               | 45 ++++++++++++------------------
 ui/scripts/cloud.core.ipaddress.js | 16 +++--------
 2 files changed, 22 insertions(+), 39 deletions(-)

diff --git a/ui/jsp/ipaddress.jsp b/ui/jsp/ipaddress.jsp
index 957643ec789..c5cce6eaeeb 100644
--- a/ui/jsp/ipaddress.jsp
+++ b/ui/jsp/ipaddress.jsp
@@ -369,49 +369,42 @@ dictionary = {
         <div id="tab_container">
 	        <div class="grid_container">
 	            <div class="grid_header">	            
+	                          
 	                <div class="grid_header_cell" style="width: 25%; ">
-	                    <div class="grid_header_title">
-	                        <fmt:message key="label.cidr.list"/></div>
-	                </div>		            
-	                <div class="grid_header_cell" style="width: 14%; ">
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.name"/></div>
 	                </div>
-	                <div class="grid_header_cell" style="width: 12%; ">
+	                <div class="grid_header_cell" style="width: 15%; ">
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.public.port"/></div>
 	                </div>
-	                <div class="grid_header_cell" style="width: 12%; ">
+	                <div class="grid_header_cell" style="width: 15%; ">
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.private.port"/></div>
 	                </div>
-	                <div class="grid_header_cell" style="width: 12%; ">
+	                <div class="grid_header_cell" style="width: 15%; ">
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.algorithm"/></div>
 	                </div>	                
-	                <div class="grid_header_cell" style="width: 6%; ">
+	                <div class="grid_header_cell" style="width: 10%; ">
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.state"/></div>
 	                </div>	                
-	                <div class="grid_header_cell" style="width: 17%; ">
+	                <div class="grid_header_cell" style="width: 15%; ">
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.actions"/></div>
 	                </div>
 	            </div>
-	            <div class="grid_rows even" id="create_load_balancer_row">	            
-	                <div class="grid_row_cell" style="width: 25%; ">  
-	                    <input id="cidr" class="text" type="text" />
-	                    <div id="cidr_errormsg" class="errormsg" style="display: none;"></div>
-	                </div>	            
-	                <div class="grid_row_cell" style="width: 14%; ">
+	            <div class="grid_rows even" id="create_load_balancer_row">	
+	                <div class="grid_row_cell" style="width: 25%; ">
 	                    <input id="name" class="text" style="width: 70%; " type="text" />
 	                    <div id="name_errormsg" class="errormsg" style="display: none;"></div>
 	                </div>
-	                <div class="grid_row_cell" style="width: 12%;">
+	                <div class="grid_row_cell" style="width: 15%;">
 	                    <input id="public_port" class="text" style="width: 70%; " type="text" />
 	                    <div id="public_port_errormsg" class="errormsg" style="display: none;"></div>
 	                </div>
-	                <div class="grid_row_cell" style="width: 12%;">
+	                <div class="grid_row_cell" style="width: 15%;">
 	                    <input id="private_port" class="text" style="width: 70%; " type="text" />
 	                    <div id="private_port_errormsg" class="errormsg" style="display: none;"></div>
 	                </div>
@@ -422,10 +415,10 @@ dictionary = {
 			                <option value='source'>source</option>    	                      
 	                    </select>
 	                </div>	                
-	                <div class="grid_row_cell" style="width: 6%;">	  
+	                <div class="grid_row_cell" style="width: 10%;">	  
                     	<div class="row_celltitles" style="padding:1px;"></div>         
 	                </div>	                
-	                <div class="grid_row_cell" style="width: 17%; ">
+	                <div class="grid_row_cell" style="width: 15%; ">
 	                    <div class="row_celltitles">
 	                        <a id="add_link" href="#"><fmt:message key="label.add"/></a></div>
 	                </div>
@@ -505,25 +498,23 @@ dictionary = {
 <!-- Load Balancer Template (begin) -->
 <div class="grid_rows odd" id="load_balancer_template" style="display:none">
     <div id="row_container">        
+              
         <div class="grid_row_cell" style="width: 25%; ">
-            <div class="row_celltitles" id="cidr" style="padding:1px;"></div>
-        </div>        
-        <div class="grid_row_cell" style="width: 14%; ">
             <div class="row_celltitles" id="name"></div>
         </div>
-        <div class="grid_row_cell" style="width: 12%; ">
+        <div class="grid_row_cell" style="width: 15%; ">
             <div class="row_celltitles" id="public_port"></div>
         </div>
-        <div class="grid_row_cell" style="width: 12%; ">
+        <div class="grid_row_cell" style="width: 15%; ">
             <div class="row_celltitles" id="private_port"></div>
         </div>
-        <div class="grid_row_cell" style="width: 12%; ">
+        <div class="grid_row_cell" style="width: 15%; ">
             <div class="row_celltitles" id="algorithm"></div>
         </div>        
-        <div class="grid_row_cell" style="width: 6%; ">
+        <div class="grid_row_cell" style="width: 10%; ">
             <div class="row_celltitles" id="state" style="padding:1px;"></div>
         </div>  
-        <div class="grid_row_cell" style="width: 17%; ">
+        <div class="grid_row_cell" style="width: 15%; ">
             <div class="row_celltitles">
                 <a id="manage_link" href="#" style="float:left;"><fmt:message key="label.manage"/></a>
                 <a id="edit_link" href="#" style="float:left; margin-left:15px;"><fmt:message key="label.edit"/></a>
diff --git a/ui/scripts/cloud.core.ipaddress.js b/ui/scripts/cloud.core.ipaddress.js
index 4d6032a7045..7334db0d396 100644
--- a/ui/scripts/cloud.core.ipaddress.js
+++ b/ui/scripts/cloud.core.ipaddress.js
@@ -533,7 +533,7 @@ function afterLoadIpJSP() {
     createLoadBalancerRow.find("#add_link").bind("click", function(event){		
 	    // validate values		    
 		var isValid = true;		
-		isValid &= validateCIDRList("CIDR", createLoadBalancerRow.find("#cidr"), createLoadBalancerRow.find("#cidr_errormsg"), true); //optional		
+		//isValid &= validateCIDRList("CIDR", createLoadBalancerRow.find("#cidr"), createLoadBalancerRow.find("#cidr_errormsg"), true); //optional		
 		isValid &= validateString("Name", createLoadBalancerRow.find("#name"), createLoadBalancerRow.find("#name_errormsg"));
 		isValid &= validateInteger("Public Port", createLoadBalancerRow.find("#public_port"), createLoadBalancerRow.find("#public_port_errormsg"), 1, 65535);
 		isValid &= validateInteger("Private Port", createLoadBalancerRow.find("#private_port"), createLoadBalancerRow.find("#private_port_errormsg"), 1, 65535);				
@@ -551,11 +551,7 @@ function afterLoadIpJSP() {
        	 	    
 	    var array1 = [];
         array1.push("&publicipid="+ipObj.id);  
-        
-        var cidr = createLoadBalancerRow.find("#cidr").val();
-        if(cidr != null && cidr.length > 0)
-        	array1.push("&cidrlist="+cidr);
-        
+       
         var name = createLoadBalancerRow.find("#name").val();  
         array1.push("&name="+todb(name));              
         
@@ -1848,10 +1844,7 @@ function ipClearLoadBalancerTab() {
 function loadBalancerJsonToTemplate(jsonObj, $template) {	
     var loadBalancerId = fromdb(jsonObj.id);	    
     $template.attr("id", "loadBalancer_" + loadBalancerId).data("loadBalancerId", loadBalancerId);		    
-       
-    $template.find("#row_container #cidr").text(fromdb(jsonObj.cidrlist));
-    $template.find("#row_container_edit #cidr").text(fromdb(jsonObj.cidrlist));
-        
+         
     $template.find("#row_container #name").text(fromdb(jsonObj.name));
     $template.find("#row_container_edit #name").val(fromdb(jsonObj.name));
     
@@ -2117,8 +2110,7 @@ function loadBalancerJsonToTemplate(jsonObj, $template) {
 }	
 
 function refreshCreateLoadBalancerRow() {
-    var createLoadBalancerRow = $("#tab_content_load_balancer #create_load_balancer_row");
-    createLoadBalancerRow.find("#cidr").val("");  
+    var createLoadBalancerRow = $("#tab_content_load_balancer #create_load_balancer_row");   
     createLoadBalancerRow.find("#name").val("");  
     createLoadBalancerRow.find("#public_port").val("");
     createLoadBalancerRow.find("#private_port").val("");