From 8835c9431134f1441fd1bc6ee1c3262e2750acb8 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 8 Nov 2010 20:49:09 -0800
Subject: [PATCH] new UI - move zonetree from system menu to new resources
 menu.

---
 ui/index.jsp                  | 21 +--------------------
 ui/scripts/cloud.core.init.js |  4 ++--
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/ui/index.jsp b/ui/index.jsp
index 52e0365e80b..4f0d56fa70a 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -652,26 +652,7 @@ long milliseconds = new Date().getTime();
                             <%=t.t("system")%>
                         </div>
                     </div>
-                    <div class="leftmenu_expandedbox" style="display: none">
-                        <div class="leftmenu_expandedlist">
-                            <div class="leftmenu_content" id="leftmenu_resource">
-                                <div class="leftmenu_secondindent">
-                                    <div class="leftmenu_arrows expanded_close" id="resource_arrow">
-                                    </div>
-                                   
-                                    <%=t.t("resources")%>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <div id="leftmenu_zone_tree">
-                        	<div id="loading_container" class="leftmenu_loadingbox" style="display:none;">
-                                <div class="leftmenu_loader"></div>
-                                <p> Loading &hellip; </p>
-                            </div>
-						    <div id="tree_container"></div>
-                        </div>
-                                                                    
+                    <div class="leftmenu_expandedbox" style="display: none">                                                          
                         <div class="leftmenu_expandedlist">
                             <div class="leftmenu_content" style="border-bottom: 1px dashed b4c8d6;" id="leftmenu_service_offering">
                                 <div class="leftmenu_secondindent">
diff --git a/ui/scripts/cloud.core.init.js b/ui/scripts/cloud.core.init.js
index b2a273f770f..e486d415c46 100644
--- a/ui/scripts/cloud.core.init.js
+++ b/ui/scripts/cloud.core.init.js
@@ -147,12 +147,12 @@ $(document).ready(function() {
 		    return false;
 		});
 		
-		$("#leftmenu_resource").bind("click", function(event) {
+		$("#leftmenu_physical_resource").bind("click", function(event) {
 			showMiddleMenu();
 			disableMultipleSelectionInMidMenu();  
 			clearMiddleMenu();
 		   
-			$arrowIcon = $(this).find("#resource_arrow");
+			$arrowIcon = $(this).find("#physical_resource_arrow");
 			if($arrowIcon.hasClass("expanded_close") == true) {
 				$arrowIcon.removeClass("expanded_close").addClass("expanded_open");
 				buildZoneTree();