From 7d9932ce492bf78d50390744e6f8ba4764994d0c Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 20 Oct 2010 10:30:50 -0700
Subject: [PATCH] new UI - when clicking Domain in left menu, build domain tree
 under it (in left menu).

---
 ui/new/index.jsp                     |  2 +-
 ui/new/scripts/cloud.core2.domain.js | 32 ++++++++++++++++++++++------
 ui/new/scripts/cloud.core2.init.js   | 21 +++---------------
 ui/new/scripts/cloud.core2.js        |  3 +--
 4 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/ui/new/index.jsp b/ui/new/index.jsp
index 3e09bddad31..89536730885 100644
--- a/ui/new/index.jsp
+++ b/ui/new/index.jsp
@@ -785,7 +785,7 @@ long milliseconds = new Date().getTime();
     <div id="domain_tree_node_template" class="leftmenu_content" style="display:none">
         <div class="leftmenu_domainindent" style="margin-left: 30px;">
             <div id="domain_title_container" class="tree_levels">
-                <div class="leftmenu_arrows expanded_close" id="arrowIcon">
+                <div class="leftmenu_arrows expanded_close" id="domain_expand_icon">
                 </div>
                 <div id="domain_name" class="tree_links">
                     Domain Name</div>
diff --git a/ui/new/scripts/cloud.core2.domain.js b/ui/new/scripts/cloud.core2.domain.js
index f91bc78bd54..e18a5227c74 100644
--- a/ui/new/scripts/cloud.core2.domain.js
+++ b/ui/new/scripts/cloud.core2.domain.js
@@ -18,14 +18,31 @@
 
 // Version: @VERSION@
 
-function afterLoadDomainJSP() {
+function afterLoadDomainJSP() {   
+    //testing code
+    /* 	
+	$("#leftmenu_domain_tree").empty();		
+	var $newNode01 = $("#domain_tree_node_template").clone();
+	$newNode01.find("#domain_name").text("01")
+	var $newNode02 = $("#domain_tree_node_template").clone();
+	$newNode02.find("#domain_name").text("02")
+	var $newNode03 = $("#domain_tree_node_template").clone();		
+	$newNode03.find("#domain_name").text("03");
+	$("#leftmenu_domain_tree").append($newNode01.show());		
+	$newNode01.find("#domain_children_container").append($newNode02.show());
+	$newNode01.find("#domain_children_container").show();		
+	$newNode02.find("#domain_children_container").append($newNode03.show());
+	$newNode02.find("#domain_children_container").show();
+	*/			
+
+
     var defaultRootDomainId = g_domainid;
     var defaultRootLevel = 0;	   
     var childParentMap = {};  //map childDomainId to parentDomainId
     var domainIdNameMap = {}; //map domainId to domainName
     
-    var $treeContentBox = $("#midmenu_container");      
-    var $treenodeTemplate = $("#treenode_template");	 
+    var $treeContentBox = $("#leftmenu_domain_tree");      
+    var $treenodeTemplate = $("#domain_tree_node_template");	 
 	var $detailsTab = $("#right_panel_content #tab_content_details");   
 	var $resourceLimitsTab = $("#right_panel_content #tab_content_resource_limits");
 	  			    
@@ -66,12 +83,13 @@ function afterLoadDomainJSP() {
 	function clickExpandIcon(domainId) {
 	    var template = $("#domain_"+domainId);
 	    var expandIcon = template.find("#domain_expand_icon_"+domainId);
-	    if (expandIcon.hasClass("zonetree_closedarrows")) {													
+	    if (expandIcon.hasClass("expanded_close")) {													
 			template.find("#domain_children_container_"+domainId).show();							
-			expandIcon.removeClass().addClass("zonetree_openarrows");
-		} else {																	
+			expandIcon.removeClass("expanded_close").addClass("expanded_open");
+		} 
+		else if (expandIcon.hasClass("expanded_open")) {																	
 		    template.find("#domain_children_container_"+domainId).hide();						
-			expandIcon.removeClass().addClass("zonetree_closedarrows");
+			expandIcon.removeClass("expanded_open").addClass("expanded_close");
 		}			
 	}					
 	
diff --git a/ui/new/scripts/cloud.core2.init.js b/ui/new/scripts/cloud.core2.init.js
index 9e6772ae3ac..0146ccdad81 100644
--- a/ui/new/scripts/cloud.core2.init.js
+++ b/ui/new/scripts/cloud.core2.init.js
@@ -49,29 +49,14 @@ $(document).ready(function() {
 	});
 	$("#leftmenu_domain").bind("click", function(event) {
 		selectLeftMenu($(this), true);
-			
-		$("#leftmenu_domain_tree").empty();		
-		var $newNode01 = $("#domain_tree_node_template").clone();
-		$newNode01.find("#domain_name").text("01")
-		var $newNode02 = $("#domain_tree_node_template").clone();
-		$newNode02.find("#domain_name").text("02")
-		var $newNode03 = $("#domain_tree_node_template").clone();		
-		$newNode03.find("#domain_name").text("03");
-		$("#leftmenu_domain_tree").append($newNode01.show());		
-		$newNode01.find("#domain_children_container").append($newNode02.show());
-		$newNode01.find("#domain_children_container").show();		
-		$newNode02.find("#domain_children_container").append($newNode03.show());
-		$newNode02.find("#domain_children_container").show();
-							
-		/*
-		showMiddleMenu();
-		disableMultipleSelectionInMidMenu();                
+		hideMiddleMenu();		
+		disableMultipleSelectionInMidMenu();      
 		clearMiddleMenu();
 		
 		$("#right_panel").load("jsp/domain.jsp", function(){ 
 			afterLoadDomainJSP();       
 		});     
-		*/
+		
 		return false;
 	});
 	$("#leftmenu_events").bind("click", function(event) {
diff --git a/ui/new/scripts/cloud.core2.js b/ui/new/scripts/cloud.core2.js
index 95128c8c419..1ac51ac650f 100644
--- a/ui/new/scripts/cloud.core2.js
+++ b/ui/new/scripts/cloud.core2.js
@@ -783,8 +783,7 @@ function listMidMenuItems2(commandString, jsonResponse1, jsonResponse2, toMidmen
 
 function listMidMenuItems(commandString, jsonResponse1, jsonResponse2, rightPanelJSP, afterLoadRightPanelJSPFn, toMidmenuFn, toRightPanelFn, getMidmenuIdFn) { 
 	showMiddleMenu();
-	disableMultipleSelectionInMidMenu();
-	
+	disableMultipleSelectionInMidMenu();	
 	clearMiddleMenu();
 	
 	$("#right_panel").load(rightPanelJSP, function(){