From 4399a051dd45aec11f73ba1b069f2750fd6c4b88 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 20 Oct 2010 16:55:35 -0700
Subject: [PATCH] new UI - domain tree - calculate indent by treenode level.

---
 ui/new/index.jsp                     |  4 ++--
 ui/new/scripts/cloud.core2.domain.js | 22 +++-------------------
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/ui/new/index.jsp b/ui/new/index.jsp
index f94cddcdaac..ce3344a4fb3 100644
--- a/ui/new/index.jsp
+++ b/ui/new/index.jsp
@@ -785,14 +785,14 @@ long milliseconds = new Date().getTime();
     <div id="domain_tree_node_template" style="display:none">    	
                 
             <div id="domain_title_container" class="leftmenu_content">
-	            <div class="leftmenu_domainindent">   
+	            <div class="leftmenu_domainindent" id="domain_indent">   
 	                <div class="leftmenu_arrows expanded_close" id="domain_expand_icon">
 	                </div>
 	                <span id="domain_name">
 	                    Domain Name</span>
 	          	</div>
             </div>                        
-            <div id="domain_children_container" style="display: none; margin-left:30px;">
+            <div id="domain_children_container" style="display: none">
             </div>
    
     </div>
diff --git a/ui/new/scripts/cloud.core2.domain.js b/ui/new/scripts/cloud.core2.domain.js
index b24732a788e..36526713b2a 100644
--- a/ui/new/scripts/cloud.core2.domain.js
+++ b/ui/new/scripts/cloud.core2.domain.js
@@ -20,24 +20,7 @@
 
 var $selectedDomainTreeNode;
 
-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();
-	*/			
-
-
+function afterLoadDomainJSP() { 
     var defaultRootDomainId = g_domainid;
     var defaultRootLevel = 0;	   
     var childParentMap = {};  //map childDomainId to parentDomainId
@@ -53,7 +36,8 @@ function afterLoadDomainJSP() {
             childParentMap[json.id] = json.parentdomainid;	//map childDomainId to parentDomainId   
         domainIdNameMap[json.id] = json.name;               //map domainId to domainName
     
-        var template = $treenodeTemplate.clone(true);	            
+        var template = $treenodeTemplate.clone(true);	  
+        template.find("#domain_indent").css("marginLeft", (30*level));           
         template.attr("id", "domain_"+json.id);	         
         template.data("jsonObj", json).data("domainLevel", level); 	      
         template.find("#domain_title_container").attr("id", "domain_title_container_"+json.id);