From 960b91acc58bf6a9dfb9c3f5031c5bbe992851ad Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 28 Dec 2010 15:48:35 -0800
Subject: [PATCH] zone tree - show loading image when expanding/collapsing a
 pod node.

---
 ui/index.jsp                      | 10 ++++++++--
 ui/scripts/cloud.core.resource.js | 14 +++++++++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/ui/index.jsp b/ui/index.jsp
index cb4c06d9b2a..80f95e460c3 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -808,7 +808,7 @@
         -->
 	        <div id="zone_header" class="leftmenu_content">  
 	            <div class="leftmenu_thirdindent">
-                	<div class="leftmenu_arrowloader" id="loading_container" style="display:none;"></div>
+                	<div class="leftmenu_arrowloader" id="zone_loading_container" style="display:none;"></div>
 	                <div class="leftmenu_arrows white_nonexpanded_close" id="zone_arrow">
 	                </div>	                
 	                <span id="zone_name_label"><fmt:message key="label.zone"/>: </span>
@@ -835,14 +835,18 @@
     <!-- Zone Template (end) -->
 	<!-- Pod Template (begin) -->    
     <div class="leftmenu_expandedlist" id="leftmenu_pod_node_template" style="display:none">
+        <!--  
     	<div class="leftmenu_loadingbox" style="display:none;"  id="loading_container">
         	<div class="leftmenu_loader"></div>
             <p> <fmt:message key="label.adding.pod"/> &hellip; </p>
         </div>
+        -->
+        <!--
         <div id="row_container">
+        -->
 	        <div id="pod_header" class="leftmenu_content">
 	            <div class="leftmenu_fourthindent">
-                	<div class="leftmenu_arrowloader" id="loading_container" style="display:none;"></div>
+                	<div class="leftmenu_arrowloader" id="pod_loading_container" style="display:none;"></div>
 	                <div class="leftmenu_arrows white_nonexpanded_close" id="pod_arrow">
 	                </div>	               
 	                <span id="pod_name_label"><fmt:message key="label.pod"/>: </span>
@@ -853,7 +857,9 @@
 	            <div id="clusters_container">
 	            </div>
 	        </div>
+	    <!--
 	    </div>
+	    -->
     </div>
     <!-- Pod Template (end) -->
 	<!-- Cluster Template (begin) -->    
diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js
index ed0baa649bd..c94f4bd5e8d 100644
--- a/ui/scripts/cloud.core.resource.js
+++ b/ui/scripts/cloud.core.resource.js
@@ -48,7 +48,7 @@ function buildZoneTree() {
 		
 		switch (action) {
 			case "zone_arrow" :				    
-			    var $loadingContainer = $zoneNode.find("#loading_container").show();
+			    var $loadingContainer = $zoneNode.find("#zone_loading_container").show();
                 var $zoneArrow = $zoneNode.find("#zone_arrow").hide();			
 			    
 			    var zoneObj = $zoneNode.data("jsonObj");
@@ -147,7 +147,10 @@ function buildZoneTree() {
 		var name = $podNode.data("name");
 		
 		switch (action) {
-			case "pod_arrow" :				    		    
+			case "pod_arrow" :				    
+			    var $loadingContainer = $podNode.find("#pod_loading_container").show();
+                var $podArrow = $podNode.find("#pod_arrow").hide();
+						    		    
 			    var podObj = $podNode.data("jsonObj");
 			    var $podContent = $podNode.find("#pod_content");					 	   
 				if(target.hasClass("expanded_close")) {						
@@ -159,8 +162,13 @@ function buildZoneTree() {
 					target.removeClass("expanded_open").addClass("expanded_close");	
 					$podContent.hide();		
 					$podContent.find("#clusters_container").empty();									
-				}	
+				}
+				
+				$loadingContainer.hide();
+                $podArrow.show();
+					
 			    break;
+			    
 			default:			
 			    selectRowInZoneTree($(this).find("#pod_header"));