From 51258656ccbb9401fec785797c3f6cfbe2cc9b96 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 18 Oct 2010 15:09:42 -0700
Subject: [PATCH] new UI - empty zonetree when collapse system left menu.

---
 ui/new/scripts/cloud.core2.init.js | 23 +++--------------------
 ui/new/scripts/cloud.core2.js      | 30 +++++++++++++++++++++++++++---
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/ui/new/scripts/cloud.core2.init.js b/ui/new/scripts/cloud.core2.init.js
index ed283e3bae7..68ebe7c4202 100644
--- a/ui/new/scripts/cloud.core2.init.js
+++ b/ui/new/scripts/cloud.core2.init.js
@@ -18,21 +18,7 @@
 
 // Version: @VERSION@
 
-$(document).ready(function() {  
-    function expandFirstLevelMenu($firstLevelMenu, $secondLevelMenu) {
-        $firstLevelMenu.find("#expandable_first_level_arrow").removeClass("close").addClass("open");
-        $firstLevelMenu.addClass("highlighted");
-        $expandedFirstLevelMenu = $firstLevelMenu;
-        $secondLevelMenu.show();
-        $expandedSecondLevelMenu = $secondLevelMenu;
-    }
-    
-    function collapseFirstLevelMenu($firstLevelMenu, $secondLevelMenu) {
-        $firstLevelMenu.find("#expandable_first_level_arrow").removeClass("open").addClass("close");
-        $firstLevelMenu.removeClass("highlighted");
-        $secondLevelMenu.hide();  
-    }
- 
+$(document).ready(function() {      
     $("#leftmenu_container").find("#expandable_first_level").bind("click", function(event) {       
         var $firstLevelMenu = $(this);
         var $secondLevelMenu = $firstLevelMenu.siblings(".leftmenu_expandedbox");
@@ -93,9 +79,7 @@ $(document).ready(function() {
         selectLeftMenu($(this));
         
         showMiddleMenuWithoutSearch();
-        disableMultipleSelectionInMidMenu();
-        
-        clearLeftMenu();
+        disableMultipleSelectionInMidMenu();                
         clearMiddleMenu();
         
         $("#right_panel").load("jsp/domain.jsp", function(){ 
@@ -106,8 +90,7 @@ $(document).ready(function() {
     
     $("#leftmenu_resource").bind("click", function(event) {         
         showMiddleMenu();
-        disableMultipleSelectionInMidMenu();        
-        clearLeftMenu();
+        disableMultipleSelectionInMidMenu();  
         clearMiddleMenu();
        
         $arrowIcon = $(this).find("#resource_arrow");
diff --git a/ui/new/scripts/cloud.core2.js b/ui/new/scripts/cloud.core2.js
index 262bb380eec..92b4c141cf2 100644
--- a/ui/new/scripts/cloud.core2.js
+++ b/ui/new/scripts/cloud.core2.js
@@ -470,10 +470,34 @@ function setBooleanField(value, $field) {
         $field.hide();
 }
  
+
+function expandFirstLevelMenu($firstLevelMenu, $secondLevelMenu) {
+    $firstLevelMenu.find("#expandable_first_level_arrow").removeClass("close").addClass("open");
+    $firstLevelMenu.addClass("highlighted");
+    $expandedFirstLevelMenu = $firstLevelMenu;
+    $secondLevelMenu.show();
+    $expandedSecondLevelMenu = $secondLevelMenu;
+}
+
+function collapseFirstLevelMenu($firstLevelMenu, $secondLevelMenu) {
+    $firstLevelMenu.find("#expandable_first_level_arrow").removeClass("open").addClass("close");
+    $firstLevelMenu.removeClass("highlighted");
+    $secondLevelMenu.hide();  
+} 
+ 
 function clearLeftMenu() {
-    var $arrowIcon = $("#leftmenu_instance_group_header #arrow_icon");
-    if($arrowIcon.hasClass("expanded_open") == true) {
-        $arrowIcon.removeClass("expanded_open").addClass("expanded_close");            
+    if($expandedFirstLevelMenu != null && $expandedSecondLevelMenu != null)  //collapse other expanded menu if there is.
+        collapseFirstLevelMenu($expandedFirstLevelMenu, $expandedSecondLevelMenu);      
+        
+    $resourceArrowIcon = $("#leftmenu_resource").find("#resource_arrow");
+    if($resourceArrowIcon.hasClass("expanded_open") == true) {
+        $resourceArrowIcon.removeClass("expanded_open").addClass("expanded_close");
+        $("#leftmenu_zone_tree").find("#tree_container").empty();
+    }        
+    
+    var $vmGroupArrowIcon = $("#leftmenu_instance_group_header #arrow_icon");
+    if($vmGroupArrowIcon.hasClass("expanded_open") == true) {
+        $vmGroupArrowIcon.removeClass("expanded_open").addClass("expanded_close");            
         $("#leftmenu_instance_group_container").empty();   
     }	
 }