From 58b727e38666f50a4ac6d847c1210690141adc21 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 14 Oct 2010 16:44:25 -0700
Subject: [PATCH] new UI - zonetree in left menu - make tree node have
 parent-children relationship. (e.g. pod is zone's child node, cluster is
 pod's child node)

---
 ui/new/index.jsp                   | 12 ++++++++----
 ui/new/scripts/cloud.core2.init.js |  6 +++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ui/new/index.jsp b/ui/new/index.jsp
index f308ad4acfc..acd26251041 100644
--- a/ui/new/index.jsp
+++ b/ui/new/index.jsp
@@ -691,7 +691,7 @@ long milliseconds = new Date().getTime();
         <%=t.t("no.available.actions")%></li>
      
      <div class="leftmenu_expandedlist" id="leftmenu_zone_node_template" style="display:none">
-        <div class="leftmenu_content selected">  
+        <div class="leftmenu_content selected" id="header">  
             <div class="leftmenu_thirdindent">
                 <div class="leftmenu_arrows expanded_close" id="arrowIcon">
                 </div>
@@ -700,9 +700,10 @@ long milliseconds = new Date().getTime();
                 Zone: <strong><span id="zone_name"></span></strong>
             </div>  
         </div>
+        <div id="zone_container"></div>
     </div>
     <div class="leftmenu_expandedlist" id="leftmenu_pod_node_template" style="display:none">
-        <div class="leftmenu_content selected">
+        <div class="leftmenu_content selected" id="header">
             <div class="leftmenu_fourthindent">
                 <div class="leftmenu_arrows expanded_close" id="arrowIcon">
                 </div>
@@ -711,10 +712,11 @@ long milliseconds = new Date().getTime();
                 Pod: <strong><span id="pod_name"></span></strong>
             </div>
         </div>
+        <div id="pod_container"></div>
     </div>
     
     <div class="leftmenu_expandedlist" id="leftmenu_cluster_node_template" style="display:none">
-        <div class="leftmenu_content selected">
+        <div class="leftmenu_content selected" id="header">
             <div class="leftmenu_fifthindent">
                 <div class="leftmenu_arrows expanded_close" id="arrowIcon">
                 </div>
@@ -723,10 +725,11 @@ long milliseconds = new Date().getTime();
                 Cluster: <strong><span id="cluster_name"></span></strong>
             </div>
         </div>
+        <div id="cluster_container"></div>
     </div> 
     
     <div class="leftmenu_expandedlist" id="leftmenu_systemvm_node_template" style="display:none">
-        <div class="leftmenu_content selected ">
+        <div class="leftmenu_content selected" id="header">
             <div class="leftmenu_fourthindent">
                 <div class="leftmenu_arrows expanded_close" id="arrowIcon">
                 </div>
@@ -735,6 +738,7 @@ long milliseconds = new Date().getTime();
                 System VM: <strong><span id="systemvm_name"></span></strong>
             </div>
         </div>
+        <div id="systemvm_container"></div>
     </div> 
     <!-- templates ends here-->
 </body>
diff --git a/ui/new/scripts/cloud.core2.init.js b/ui/new/scripts/cloud.core2.init.js
index bbb6d896010..8ef3da058bd 100644
--- a/ui/new/scripts/cloud.core2.init.js
+++ b/ui/new/scripts/cloud.core2.init.js
@@ -159,13 +159,13 @@ $(document).ready(function() {
         $zoneTree.append($zoneNode.show());
         
         var $podNode = $("#leftmenu_pod_node_template").clone();
-        $zoneTree.append($podNode.show());
+        $zoneNode.find("#zone_container").append($podNode.show());
         
         var $clusterNode = $("#leftmenu_cluster_node_template").clone();
-        $zoneTree.append($clusterNode.show());
+        $podNode.find("#pod_container").append($clusterNode.show());
         
         var $systemvmNode = $("#leftmenu_systemvm_node_template").clone();
-        $zoneTree.append($systemvmNode.show());
+        $zoneNode.find("#zone_container").append($systemvmNode.show());
     }