From 0f33a2cdbca9d29eb7768ff13ca43eef02d9cec5 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 10 Aug 2011 12:10:48 -0700
Subject: [PATCH] cloudStack - IP Address page - Port Forwarding tab - remove
 Source CIDR.

---
 ui/jsp/ipaddress.jsp               | 35 ++++++++++--------------------
 ui/scripts/cloud.core.ipaddress.js | 26 +++++-----------------
 2 files changed, 18 insertions(+), 43 deletions(-)

diff --git a/ui/jsp/ipaddress.jsp b/ui/jsp/ipaddress.jsp
index 428af847570..957643ec789 100644
--- a/ui/jsp/ipaddress.jsp
+++ b/ui/jsp/ipaddress.jsp
@@ -288,11 +288,7 @@ dictionary = {
         </div>        
         <div id="tab_container">
 	        <div class="grid_container" id="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">	                          
 	                <div class="grid_header_cell" style="width: 15%; ">
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.public.port"/></div>
@@ -305,24 +301,20 @@ dictionary = {
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.protocol"/></div>
 	                </div>
-	                <div class="grid_header_cell" style="width: 15%;  border: none;">
+	                <div class="grid_header_cell" style="width: 30%;  border: none;">
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.instance"/></div>
 	                </div>
-	                <div class="grid_header_cell" style="width: 5%; ">
+	                <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: 10%; ">
+	                <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_port_forwarding_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;">Error msg will appear here</div>
-	                </div>
+	            <div class="grid_rows even" id="create_port_forwarding_row">	               
 	                <div class="grid_row_cell" style="width: 15%; ">
 	                    <input id="public_port" class="text" style="width: 30%; " type="text" />
 	                    <div id="public_port_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div>
@@ -345,15 +337,15 @@ dictionary = {
 	                   <select class="select" id="protocol" style="width:70%;">	                    
 	                   </select>
 	                </div>
-	                <div class="grid_row_cell" style="width: 15%; ">                   
+	                <div class="grid_row_cell" style="width: 30%; ">                   
 	                    <select class="select" id="vm">
 	                    </select>
 	                    <div id="vm_errormsg" class="errormsg" style="display: none;"></div>	                    
 	                </div>
-	                <div class="grid_row_cell" style="width: 5%; ">   
+	                <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: 10%; ">
+	                <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>
@@ -673,10 +665,7 @@ dictionary = {
 
 <!-- Port Forwarding template (begin) -->
 <div class="grid_rows odd" id="port_forwarding_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 id="row_container">       
         <div class="grid_row_cell" style="width: 15%; ">
             <div class="row_celltitles" id="public_port"></div>
         </div>
@@ -686,13 +675,13 @@ dictionary = {
         <div class="grid_row_cell" style="width: 10%; ">
             <div class="row_celltitles" id="protocol"></div>
         </div>
-        <div class="grid_row_cell" style="width: 15%; ">
+        <div class="grid_row_cell" style="width: 30%; ">
             <div class="row_celltitles" id="vm_name"></div>
         </div>   
-        <div class="grid_row_cell" style="width: 5%; ">
+        <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: 10%; ">
+        <div class="grid_row_cell" style="width: 15%; ">
             <div class="row_celltitles">
                 <a id="delete_link" href="#" style="float:left;"><fmt:message key="label.delete"/> </a>                                
             </div>
diff --git a/ui/scripts/cloud.core.ipaddress.js b/ui/scripts/cloud.core.ipaddress.js
index 7a0843d9714..4d6032a7045 100644
--- a/ui/scripts/cloud.core.ipaddress.js
+++ b/ui/scripts/cloud.core.ipaddress.js
@@ -418,7 +418,7 @@ function afterLoadIpJSP() {
     $createPortForwardingRow.find("#add_link").bind("click", function(event){	        
 		var isValid = true;		
 	
-		isValid &= validateCIDRList("CIDR", $createPortForwardingRow.find("#cidr"), $createPortForwardingRow.find("#cidr_errormsg"), true); //optional		
+		//isValid &= validateCIDRList("CIDR", $createPortForwardingRow.find("#cidr"), $createPortForwardingRow.find("#cidr_errormsg"), true); //optional		
 				
 		isValid &= validateInteger("Public Port", $createPortForwardingRow.find("#public_port"), $createPortForwardingRow.find("#public_port_errormsg"), 1, 65535, false); //required
 		isValid &= validateInteger("Public End Port", $createPortForwardingRow.find("#public_end_port"), $createPortForwardingRow.find("#public_end_port_errormsg"), 1, 65535, true); //optional
@@ -426,17 +426,9 @@ function afterLoadIpJSP() {
 		isValid &= validateInteger("Private Port", $createPortForwardingRow.find("#private_port"), $createPortForwardingRow.find("#private_port_errormsg"), 1, 65535, false); //required		
 		isValid &= validateInteger("Private End Port", $createPortForwardingRow.find("#private_end_port"), $createPortForwardingRow.find("#private_end_port_errormsg"), 1, 65535, true); //optional				
 		
-			isValid &= validateCIDRList("CIDR", $createPortForwardingRow.find("#cidr"), $createPortForwardingRow.find("#cidr_errormsg"), true); //optional		
-					
-			isValid &= validateInteger("Public Port", $createPortForwardingRow.find("#public_port"), $createPortForwardingRow.find("#public_port_errormsg"), 1, 65535, false); //required
-			//isValid &= validateInteger("Public End Port", $createPortForwardingRow.find("#public_end_port"), $createPortForwardingRow.find("#public_end_port_errormsg"), 1, 65535, true); //optional
-			
-			isValid &= validateInteger("Private Port", $createPortForwardingRow.find("#private_port"), $createPortForwardingRow.find("#private_port_errormsg"), 1, 65535, false); //required		
-			//isValid &= validateInteger("Private End Port", $createPortForwardingRow.find("#private_end_port"), $createPortForwardingRow.find("#private_end_port_errormsg"), 1, 65535, true); //optional				
-			
-			isValid &= validateDropDownBox("Instance", $createPortForwardingRow.find("#vm"), $createPortForwardingRow.find("#vm_errormsg"));	
-			if (!isValid) 
-			    return;			
+	    isValid &= validateDropDownBox("Instance", $createPortForwardingRow.find("#vm"), $createPortForwardingRow.find("#vm_errormsg"));	
+		if (!isValid) 
+		    return;			
 		    
 		    var $template = $("#port_forwarding_template").clone();
 		    $("#tab_content_port_forwarding #grid_content").append($template.show());		
@@ -450,11 +442,7 @@ function afterLoadIpJSP() {
 				
 	        var array1 = [];
 	        array1.push("&ipaddressid="+ipObj.id);           
-	        
-	        var cidr = $createPortForwardingRow.find("#cidr").val();
-	        if(cidr != null && cidr.length > 0)
-	        	array1.push("&cidrlist="+cidr);
-	        
+	        	      
 		    var publicPort = $createPortForwardingRow.find("#public_port").val();
 		    array1.push("&publicport="+publicPort);	    
 		    var publicEndPort = $createPortForwardingRow.find("#public_end_port").val();
@@ -1718,9 +1706,7 @@ function ipClearPortForwardingTab() {
 
 function portForwardingJsonToTemplate(jsonObj, $template) {				        
     $template.attr("id", "portForwarding_" + fromdb(jsonObj.id)).data("portForwardingId", fromdb(jsonObj.id));	
-    
-    $template.find("#cidr").text(fromdb(jsonObj.cidrlist));
-    
+       
     var publicPort = fromdb(jsonObj.publicport);
     if(jsonObj.publicendport != null && jsonObj.publicendport.length > 0)
     	publicPort += (" - " + fromdb(jsonObj.publicendport));