From 56b28cf5160771f8416af95a4a29de5e7b43cb66 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 9 Dec 2010 19:29:23 -0800
Subject: [PATCH] bug 7458: zone - network - after creating load balancer, show
 the newly created item on UI.

---
 ui/jsp/network.jsp               |  4 ++--
 ui/scripts/cloud.core.network.js | 22 ++++++++++------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/ui/jsp/network.jsp b/ui/jsp/network.jsp
index 70629f0ab2a..35c19f667aa 100644
--- a/ui/jsp/network.jsp
+++ b/ui/jsp/network.jsp
@@ -465,8 +465,8 @@
 	<div class="grid_header">
         <div class="grid_header_title" id="grid_header_title">
         </div>
-        <div class="grid_actionbox" id="firewall_action_link">
-            <div class="grid_actionsdropdown_box" id="firewall_action_menu" style="display: none;">
+        <div class="grid_actionbox" id="loadbalancer_action_link">
+            <div class="grid_actionsdropdown_box" id="loadbalancer_action_menu" style="display: none;">
                 <ul class="actionsdropdown_boxlist" id="action_list">
                 </ul>
             </div>
diff --git a/ui/scripts/cloud.core.network.js b/ui/scripts/cloud.core.network.js
index fc20c6b80e5..dd8e0f43fe3 100644
--- a/ui/scripts/cloud.core.network.js
+++ b/ui/scripts/cloud.core.network.js
@@ -325,20 +325,20 @@ function publicNetworkLoadBalancerJsonToTemplate(jsonObj, $template) {
     $template.find("#type").text(fromdb(jsonObj.type));
     $template.find("#url").text(fromdb(jsonObj.url));   
    
-    var $actionLink = $template.find("#firewall_action_link");		
+    var $actionLink = $template.find("#loadbalancer_action_link");		
 	$actionLink.bind("mouseover", function(event) {
-        $(this).find("#firewall_action_menu").show();    
+        $(this).find("#loadbalancer_action_menu").show();    
         return false;
     });
     $actionLink.bind("mouseout", function(event) {
-        $(this).find("#firewall_action_menu").hide();    
+        $(this).find("#loadbalancer_action_menu").hide();    
         return false;
     });		
 	
-	var $actionMenu = $actionLink.find("#firewall_action_menu");
+	var $actionMenu = $actionLink.find("#loadbalancer_action_menu");
     $actionMenu.find("#action_list").empty();	
        
-    buildActionLinkForSubgridItem("Delete Firewall", publicNetworkFirewallActionMap, $actionMenu, $template);	
+    buildActionLinkForSubgridItem("Delete Load Balancer", publicNetworkLoadBalancerActionMap, $actionMenu, $template);	
 }
 
 var publicNetworkLoadBalancerActionMap = {     
@@ -777,13 +777,11 @@ function initAddLoadBalancerButton($button, $midmenuItem1) {
 					success: function(json) {	
 						$thisDialog.find("#spinning_wheel").hide();
 						$thisDialog.dialog("close");
-					   				    
-					    /*
-					    var item = json.createvlaniprangeresponse.vlan;						    
-					    var $newTemplate = $("#iprange_template").clone();
-	                    publicNetworkIprangeJsonToTemplate(item, $newTemplate);
-	                    $("#public_network_page").find("#tab_content_ipallocation").find("#tab_container").prepend($newTemplate.show());	
-	                    */					   
+					   	
+					   	var item = json.addexternalloadbalancerresponse.externalloadbalancer;			    
+					    var $newTemplate = $("#loadbalancer_template").clone();
+		                publicNetworkLoadBalancerJsonToTemplate(item, $newTemplate);
+		                $("#right_panel_content #public_network_page #tab_content_loadbalancer").find("#tab_container").append($newTemplate.show());
 					},
 					error: function(XMLHttpResponse) {
 						handleError(XMLHttpResponse, function() {