From 743f58fb0c24e61ff166bc8194dce3a9af48218d Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 19 Oct 2010 10:19:09 -0700
Subject: [PATCH] new UI - hide middle menu when clicking zone node, pod node,
 systemVM node, dashboard. show middle menu otherwise.

---
 ui/new/css/main.css                    |  4 ++--
 ui/new/scripts/cloud.core2.init.js     |  4 +++-
 ui/new/scripts/cloud.core2.js          | 10 +++-------
 ui/new/scripts/cloud.core2.resource.js |  8 ++++++--
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/ui/new/css/main.css b/ui/new/css/main.css
index 90f2c96f13b..b308590f147 100644
--- a/ui/new/css/main.css
+++ b/ui/new/css/main.css
@@ -2092,7 +2092,7 @@ a:hover.search_button {
 }
 
 
-.main_contentarea {
+.main_contentarea_with_midmenu {
 	width:auto;
 	min-height:1000px;
 	height:auto;
@@ -2100,7 +2100,7 @@ a:hover.search_button {
 	padding:0;
 }
 
-.main_contentarea_dashboard {
+.main_contentarea_without_midmenu {
 	width:auto;
 	min-height:1000px;
 	height:auto;
diff --git a/ui/new/scripts/cloud.core2.init.js b/ui/new/scripts/cloud.core2.init.js
index 68ebe7c4202..745a63293c0 100644
--- a/ui/new/scripts/cloud.core2.init.js
+++ b/ui/new/scripts/cloud.core2.init.js
@@ -69,6 +69,8 @@ $(document).ready(function() {
         selectLeftMenu($(this));
             
         hideMiddleMenu();
+        
+        $("#right_panel").removeClass("main_contentarea").addClass("main_contentarea_dashboard");        
         $("#right_panel").load("jsp/dashboard.jsp", function(){
             afterLoadDashboardJSP();        
         });
@@ -78,7 +80,7 @@ $(document).ready(function() {
     $("#leftmenu_domain").bind("click", function(event) {  
         selectLeftMenu($(this));
         
-        showMiddleMenuWithoutSearch();
+        showMiddleMenu();
         disableMultipleSelectionInMidMenu();                
         clearMiddleMenu();
         
diff --git a/ui/new/scripts/cloud.core2.js b/ui/new/scripts/cloud.core2.js
index 363791c9e4a..f00e6eaaad3 100644
--- a/ui/new/scripts/cloud.core2.js
+++ b/ui/new/scripts/cloud.core2.js
@@ -540,17 +540,13 @@ var $expandedFirstLevelMenu, $expandedSecondLevelMenu;
 var selected_midmenu_id = null; 
 function hideMiddleMenu() {
     $("#middle_menu, #search_panel, #middle_menu_pagination").hide();
-    $("#right_panel").removeClass("main_contentarea").addClass("main_contentarea_dashboard");
+    $("#midmenu_container").empty();
+    $("#right_panel").removeClass("main_contentarea_with_midmenu").addClass("main_contentarea_without_midmenu");            
 }
 function showMiddleMenu() {
     $("#middle_menu, #search_panel, #middle_menu_pagination").show();
-    $("#right_panel").removeClass("main_contentarea_dashboard").addClass("main_contentarea");
+    $("#right_panel").removeClass("main_contentarea_without_midmenu").addClass("main_contentarea_with_midmenu");
 }    
-function showMiddleMenuWithoutSearch() {
-    $("#middle_menu").show();
-    $("#search_panel, #middle_menu_pagination").hide();
-    $("#right_panel").removeClass("main_contentarea_dashboard").addClass("main_contentarea");
-} 
 
 // adding middle menu item ***
 function beforeAddingMidMenuItem() {
diff --git a/ui/new/scripts/cloud.core2.resource.js b/ui/new/scripts/cloud.core2.resource.js
index 27d479e9b77..94abfbae419 100644
--- a/ui/new/scripts/cloud.core2.resource.js
+++ b/ui/new/scripts/cloud.core2.resource.js
@@ -77,6 +77,7 @@ function buildZoneTree() {
 			    selectLeftMenu(target.parent().parent().parent());						    
 			    var jsonObj = target.data("jsonObj");  
 			    showPage($("#zone_page"), jsonObj);
+			    hideMiddleMenu();
 			    zoneJsonToDetailsTab(jsonObj);
 			    zoneJsonToNetworkTab(jsonObj);				    
 			    zoneJsonToSecondaryStorageTab(jsonObj);						    		   			    
@@ -85,7 +86,8 @@ function buildZoneTree() {
 			case "pod_name" :	
 			    selectLeftMenu(target.parent().parent().parent());
 			    var jsonObj = target.data("jsonObj");
-			    showPage($("#pod_page"), jsonObj);		
+			    showPage($("#pod_page"), jsonObj);	
+			    hideMiddleMenu();	
 			    podJsonToDetailsTab(jsonObj);				
 				break;		
 				    
@@ -93,6 +95,7 @@ function buildZoneTree() {
 			    selectLeftMenu(target.parent().parent().parent());			    
 			    var jsonObj = target.data("jsonObj");
 			    showPage($("#cluster_page"), jsonObj);
+			    showMiddleMenu();
 			    clusterJsonToDetailsTab(jsonObj);
 			    var clusterId = jsonObj.id;
 			    $("#midmenu_container").empty();
@@ -103,7 +106,8 @@ function buildZoneTree() {
 			case "systemvm_name" :		
 			    selectLeftMenu(target.parent().parent().parent());		
 			    var jsonObj = target.data("jsonObj");	
-			    showPage($("#systemvm_page"), jsonObj);					
+			    showPage($("#systemvm_page"), jsonObj);		
+			    hideMiddleMenu();			
 				systemvmJsonToDetailsTab(jsonObj);			
 				break;