From cfb5940fbc32bdf01a00806dc90976a3fd65a00f Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 11 Feb 2011 19:32:34 -0800
Subject: [PATCH] IP Address page, Security Group page - localize title in all
 dialog boxes.

---
 ui/jsp/ipaddress.jsp                   |  2 +-
 ui/scripts/cloud.core.ipaddress.js     |  2 +-
 ui/scripts/cloud.core.securitygroup.js | 54 ++------------------------
 3 files changed, 6 insertions(+), 52 deletions(-)

diff --git a/ui/jsp/ipaddress.jsp b/ui/jsp/ipaddress.jsp
index 0f69f4caa5a..0ba66ac9024 100644
--- a/ui/jsp/ipaddress.jsp
+++ b/ui/jsp/ipaddress.jsp
@@ -787,7 +787,7 @@ dictionary = {
 <!-- Create User for VPN (end) -->
 
 <!-- Enable Static NAT Dialog (begin) -->
-<div id="dialog_enable_static_NAT" title="Enable Static NAT" style="display: none">   
+<div id="dialog_enable_static_NAT" title='<fmt:message key="label.action.enable.static.NAT"/>' style="display: none">   
     <div class="dialog_formcontent">
         <form action="#" method="post" id="form3">
         <ol>
diff --git a/ui/scripts/cloud.core.ipaddress.js b/ui/scripts/cloud.core.ipaddress.js
index e3454663691..889bd34f310 100644
--- a/ui/scripts/cloud.core.ipaddress.js
+++ b/ui/scripts/cloud.core.ipaddress.js
@@ -1350,7 +1350,7 @@ function doEnableStaticNAT($actionLink, $detailsTab, $midmenuItem1) {
 function doDisableStaticNAT($actionLink, $detailsTab, $midmenuItem1) {  
     var ipObj = $midmenuItem1.data("jsonObj");
     
-    $("#dialog_info")
+    $("#dialog_confirmation")
     .text(dictionary["message.action.disable.static.NAT"])    
 	.dialog('option', 'buttons', { 						
 		"Confirm": function() { 		    
diff --git a/ui/scripts/cloud.core.securitygroup.js b/ui/scripts/cloud.core.securitygroup.js
index 61fe6487743..2ee36ce8d59 100644
--- a/ui/scripts/cloud.core.securitygroup.js
+++ b/ui/scripts/cloud.core.securitygroup.js
@@ -414,7 +414,7 @@ function securityGroupJsonToDetailsTab() {
     //actions ***
     var $actionMenu = $("#right_panel_content #tab_content_details #action_link #action_menu");
     $actionMenu.find("#action_list").empty();  
-    buildActionLinkForTab("Delete Security Group", securityGroupActionMap, $actionMenu, $midmenuItem1, $thisTab);	  
+    buildActionLinkForTab("label.action.delete.security.group", securityGroupActionMap, $actionMenu, $midmenuItem1, $thisTab);	  
     
     $thisTab.find("#tab_spinning_wheel").hide();    
     $thisTab.find("#tab_container").show();         
@@ -489,17 +489,7 @@ function securityGroupIngressRuleJSONToTemplate(jsonObj, $template) {
     // actions	
 	var $actionLink = $template.find("#action_link");
 	bindActionLink($actionLink);
-	/*		
-	$actionLink.bind("mouseover", function(event) {
-        $(this).find("#action_menu").show();    
-        return false;
-    });
-    $actionLink.bind("mouseout", function(event) {
-        $(this).find("#action_menu").hide();    
-        return false;
-    });	
-    */	
-	
+		
 	var $actionMenu = $actionLink.find("#action_menu");
     $actionMenu.find("#action_list").empty();	
         
@@ -536,42 +526,7 @@ function doDeleteIngressRule($actionLink, $subgridItem) {
 	        moreCriteria.push("&domainid="+securityGroupObj.domainid);    	    	        
 	        moreCriteria.push("&account="+securityGroupObj.account);    	    		    	        
 	        moreCriteria.push("&id="+id);    
-	      
-    	    /*	
-    	    moreCriteria.push("&securitygroupid="+securityGroupObj.id);    
-    	    
-    	    var protocol = ingressRuleObj.protocol;      
-	        moreCriteria.push("&protocol="+protocol);		    	
-    	 
-	        if(protocol == "icmp") {
-	            var icmpType = ingressRuleObj.icmptype;
-	            if(icmpType != null)
-	                moreCriteria.push("&icmptype="+encodeURIComponent(icmpType));
-    		    
-	            var icmpCode = ingressRuleObj.icmpcode;
-	            if(icmpCode != null)
-	                moreCriteria.push("&icmpcode="+encodeURIComponent(icmpCode));
-	        }
-	        else {  //TCP, UDP
-	            var startPort = ingressRuleObj.startport;
-	            if(startPort != null)
-	                moreCriteria.push("&startport="+encodeURIComponent(startPort));
-    		    
-	            var endPort = ingressRuleObj.endport;
-	            if(endPort != null)
-	                moreCriteria.push("&endport="+encodeURIComponent(endPort));
-	        }
-    	        
-	        var cidr = ingressRuleObj.cidr;
-	        if(cidr != null && cidr.length > 0)
-	            moreCriteria.push("&cidrlist="+encodeURIComponent(cidr));
-    						
-	        var account = ingressRuleObj.account;
-	        var securitygroupname = ingressRuleObj.securitygroupname; 
-	        if((account != null && account.length > 0) && (securitygroupname != null && securitygroupname.length > 0))                        
-                moreCriteria.push("&usersecuritygrouplist[0].account="+account + "&usersecuritygrouplist[0].group="+securitygroupname);    			
-			*/
-						
+	      						
 			var apiCommand = "command=revokeSecurityGroupIngress"+moreCriteria.join("");                  
             doActionToSubgridItem(id, $actionLink, apiCommand, $subgridItem); 
 	    }, 
@@ -605,8 +560,7 @@ function securityGroupClearDetailsTab() {
 }
 
 var securityGroupActionMap = {       
-    "Delete Security Group": {               
-        api: "deleteSecurityGroup",     
+    "label.action.delete.security.group": {   
         isAsyncJob: false,  
         dialogBeforeActionFn : doDeleteSecurityGroup,               
         inProcessText: "Deleting Security Group....",