From c8a0cd13e125ff5cce5ee6b113d0010c6f3b390a Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 12 Nov 2010 10:43:30 -0800
Subject: [PATCH] new UI - pod page - network tab - add "Delete VLAN" action
 link.

---
 ui/jsp/pod.jsp               |  2 +-
 ui/scripts/cloud.core.pod.js | 33 ++++++++++++++++++++++++++++++---
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/ui/jsp/pod.jsp b/ui/jsp/pod.jsp
index d3a372123c1..da323b7427f 100644
--- a/ui/jsp/pod.jsp
+++ b/ui/jsp/pod.jsp
@@ -147,7 +147,7 @@
     <div class="grid_header">
         <div class="grid_header_title" id="grid_header_title">
         </div>
-        <div class="grid_actionbox" id="network_action_link" style="display: none;">
+        <div class="grid_actionbox" id="network_action_link">
             <div class="grid_actionsdropdown_box" id="network_action_menu" style="display: none;">
                 <ul class="actionsdropdown_boxlist" id="action_list">
                 </ul>
diff --git a/ui/scripts/cloud.core.pod.js b/ui/scripts/cloud.core.pod.js
index 06f16c20ca0..6249fafdf64 100644
--- a/ui/scripts/cloud.core.pod.js
+++ b/ui/scripts/cloud.core.pod.js
@@ -83,7 +83,7 @@ function podJsonToDetailsTab() {
 				
 				//temporary code before bug 7162 is fixed ********(begin)***********		
 				for(var i=0; i<items.length; i++) {				   		    
-				    if(items[i].name == jsonObj.zonename) {
+				    if(items[i].id == jsonObj.zoneid) {
 				        zoneVlan = items[i].vlan; 
 				    }
 				}	
@@ -134,7 +134,7 @@ function podJsonToNetworkTab() {
 			if (items != null && items.length > 0) {					    
 				for (var i = 0; i < items.length; i++) {	
 				    var newTemplate = template.clone(true);	               
-	                podVLANJSONToTemplate(items[i], newTemplate); 
+	                podNetworkJsonToTemplate(items[i], newTemplate); 
 	                $container.append(newTemplate.show());	
 				}
 			}
@@ -144,7 +144,7 @@ function podJsonToNetworkTab() {
 	});			
 } 
 
-function podVLANJSONToTemplate(jsonObj, template) {
+function podNetworkJsonToTemplate(jsonObj, template) {
     template.data("jsonObj", jsonObj);     
     template.attr("id", "pod_VLAN_"+jsonObj.id).data("podVLANId", jsonObj.id);    
     template.find("#grid_header_title").text(fromdb(jsonObj.description));			   
@@ -154,8 +154,35 @@ function podVLANJSONToTemplate(jsonObj, template) {
     template.find("#gateway").text(jsonObj.gateway);
     template.find("#podname").text(jsonObj.podname); 
    
+    var $actionLink = template.find("#network_action_link");		
+	$actionLink.bind("mouseover", function(event) {
+        $(this).find("#network_action_menu").show();    
+        return false;
+    });
+    $actionLink.bind("mouseout", function(event) {
+        $(this).find("#network_action_menu").hide();    
+        return false;
+    });		
+	
+	var $actionMenu = $actionLink.find("#network_action_menu");
+    $actionMenu.find("#action_list").empty();	
+    
+    buildActionLinkForSubgridItem("Delete VLAN", podNetworkActionMap, $actionMenu, template);	
 }
 
+var podNetworkActionMap = {  
+    "Delete VLAN": {              
+        api: "deleteVlanIpRange",     
+        isAsyncJob: false,   
+        inProcessText: "Deleting VLAN....",
+        afterActionSeccessFn: function(json, id, $subgridItem) {                 
+            $subgridItem.slideUp("slow", function() {
+                $(this).remove();
+            });
+        }
+    } 
+}  
+
 function podJsonClearRightPanel(jsonObj) {	 
     podJsonClearDetailsTab(jsonObj);
 }