From 4a3418cea3ceb6f6e48fe586fd325d786c3a8e92 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 28 Dec 2010 16:36:29 -0800
Subject: [PATCH] Clicking on arrow icon of Physical Resource menu will show a
 loading image until the whole zonetree is expanded/collapsed.

---
 ui/index.jsp                      | 101 +++++++++++-------------------
 ui/scripts/cloud.core.resource.js |  10 ++-
 2 files changed, 43 insertions(+), 68 deletions(-)

diff --git a/ui/index.jsp b/ui/index.jsp
index 80f95e460c3..e8cdf3c1b36 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -600,11 +600,7 @@
                             </div>
                         </div>
                         
-                        <div id="leftmenu_zone_tree">
-                        	<div id="loading_container" class="leftmenu_loadingbox" style="display:none;">
-                                <div class="leftmenu_loader"></div>
-                                <p> <fmt:message key="label.loading"/> &hellip; </p>
-                            </div>
+                        <div id="leftmenu_zone_tree">                            
 						    <div id="tree_container"></div>
                         </div>              
 
@@ -796,70 +792,45 @@
     <!-- middle menu: no items available (end) --> 
     
     <!-- Zone Template (begin) --> 
-    <div class="leftmenu_expandedlist" id="leftmenu_zone_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.zone"/> &hellip; </p>
-        </div>
-        -->
-        <!--  
-        <div id="row_container">
-        -->
-	        <div id="zone_header" class="leftmenu_content">  
-	            <div class="leftmenu_thirdindent">
-                	<div class="leftmenu_arrowloader" id="zone_loading_container" style="display:none;"></div>
-	                <div class="leftmenu_arrows white_nonexpanded_close" id="zone_arrow">
+    <div class="leftmenu_expandedlist" id="leftmenu_zone_node_template" style="display:none">       
+        <div id="zone_header" class="leftmenu_content">  
+            <div class="leftmenu_thirdindent">
+            	<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>
+                <span id="zone_name"></span>
+            </div>  
+        </div>			
+        <div id="zone_content" style="display: none">
+            <div id="pods_container">
+            </div>	 
+            	            
+            <div id="network_header" class="leftmenu_content" style="display: none">
+	            <div class="leftmenu_fourthindent">
+	                <div class="leftmenu_arrows white_nonexpanded_close" id="cluster_arrow">
 	                </div>	                
-	                <span id="zone_name_label"><fmt:message key="label.zone"/>: </span>
-	                <span id="zone_name"></span>
-	            </div>  
-	        </div>			
-            <div id="zone_content" style="display: none">
-	            <div id="pods_container">
-	            </div>	 
-	            	            
-	            <div id="network_header" class="leftmenu_content" style="display: none">
-		            <div class="leftmenu_fourthindent">
-		                <div class="leftmenu_arrows white_nonexpanded_close" id="cluster_arrow">
-		                </div>	                
-		                <span id="network_name_label">Network</span>	 
-		            </div>
-		        </div>	
-	            	                       
-	        </div>
-	    <!--  
-		</div>
-		-->
+	                <span id="network_name_label">Network</span>	 
+	            </div>
+	        </div>	            	                       
+        </div>	    
     </div>
     <!-- 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="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>
-	                <span id="pod_name"></span>
-	            </div>
-	        </div>	
-            <div id="pod_content" style="display: none">
-	            <div id="clusters_container">
-	            </div>
-	        </div>
-	    <!--
-	    </div>
-	    -->
+    <div class="leftmenu_expandedlist" id="leftmenu_pod_node_template" style="display:none">              
+	    <div id="pod_header" class="leftmenu_content">
+            <div class="leftmenu_fourthindent">
+            	<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>
+                <span id="pod_name"></span>
+            </div>
+        </div>	
+        <div id="pod_content" style="display: none">
+            <div id="clusters_container">
+            </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 2fcbd432c3a..b893339065e 100644
--- a/ui/scripts/cloud.core.resource.js
+++ b/ui/scripts/cloud.core.resource.js
@@ -18,7 +18,9 @@
 
 function buildZoneTree() {     
     var forceLogout = true;  // We force a logout only if the user has first added a POD for the very first time     
-    var $loading = $("#leftmenu_zone_tree").find("#loading_container").show();
+    var $loadingContainer = $("#leftmenu_physical_resource").find("#loading_container").show();
+    var $arrowIcon = $("#leftmenu_physical_resource").find("#physical_resource_arrow").hide();
+    
     var $zoneTree = $("#leftmenu_zone_tree").find("#tree_container").hide();
   
     $.ajax({
@@ -34,8 +36,10 @@ function buildZoneTree() {
 					container.append($zoneNode.show());
 				}
 			}	
-			$loading.hide();
-            $zoneTree.show();
+			$zoneTree.show();
+			
+			$loadingContainer.hide();
+			$arrowIcon.show();            
 		}
 	});