apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

The left menu navigation should be smooth now.

Browse Source
This commit is contained in:
will 2010-12-13 18:56:06 -08:00
parent 58f2c90608
commit 50a076efbf
3 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ui/scripts/cloud.core.domain.js
View File

@ -32,7 +32,7 @@ function refreshWholeTree(rootDomainId, rootLevel) {
//draw root node
function drawRootNode(rootDomainId) {
var $loading = $("#leftmenu_domain_tree").find("#loading_container").show();
//var $loading = $("#leftmenu_domain_tree").find("#loading_container");
var $domainTree = $("#leftmenu_domain_tree").find("#tree_container").hide();
$.ajax({
@ -43,24 +43,24 @@ function drawRootNode(rootDomainId) {
var domains = json.listdomainsresponse.domain;
$domainTree.empty();
if (domains != null && domains.length > 0) {
var node = drawNode(domains[0], $domainTree);
var node = drawNode(domains[0], $("#domain_tree_node_template"), $domainTree);
var treeLevelsbox = node.find(".tree_levelsbox"); //root node shouldn't have margin-left:20px
if(treeLevelsbox!=null && treeLevelsbox.length >0)
treeLevelsbox[0].style.marginLeft="0px"; //set root node's margin-left to 0px.
}
$loading.hide();
//$loading.hide();
$domainTree.show();
}
});
}
function drawNode(json, container) {
function drawNode(json, template, container) {
if("parentdomainid" in json)
childParentMap[json.id] = json.parentdomainid; //map childDomainId to parentDomainId
domainIdNameMap[json.id] = json.name; //map domainId to domainName
var $treeNode = $("#domain_tree_node_template").clone(true).attr("id", "domain_tree_node_template_clone");
var $treeNode = template.clone(true).attr("id", "domain_tree_node_template_clone");
$treeNode.find("#domain_indent").css("marginLeft", (30*(json.level+1)));
$treeNode.attr("id", "domain_"+fromdb(json.id));
$treeNode.data("jsonObj", json).data("domainLevel", json.level);
@ -73,6 +73,7 @@ function drawNode(json, container) {
}
function drawTree(id, container) {
var $treeNodeTemplate = $("#domain_tree_node_template");
$.ajax({
data: createURL("command=listDomainChildren&id="+id),
dataType: "json",
@ -81,11 +82,7 @@ function drawTree(id, container) {
var domains = json.listdomainchildrenresponse.domain;
if (domains != null && domains.length > 0) {
for (var i = 0; i < domains.length; i++) {
drawNode(domains[i], container);
/*
if(domains[i].haschild == true)
drawTree(domains[i].id, $("#domain_children_container_"+domains[i].id));
*/
drawNode(domains[i], $treeNodeTemplate, container);
}
}
}
@ -198,7 +195,7 @@ function initAddDomainDialog() {
if($expandIcon.hasClass("expanded_close"))
$expandIcon.click(); //expand parentDomain node
else
drawNode(item, $("#domain_children_container_"+item.parentdomainid));
drawNode(item, $("#domain_tree_node_template"), $("#domain_children_container_"+item.parentdomainid));
}
});
},

25
ui/scripts/cloud.core.init.js
View File

@ -41,8 +41,6 @@ $(document).ready(function() {
$("#leftmenu_domain").bind("click", function(event) {
selectLeftMenu($(this), true);
bindEventHandlerToDomainTreeNode();
drawRootNode(g_domainid);
return false;
});
$("#leftmenu_account").bind("click", function(event) {
@ -52,19 +50,18 @@ $(document).ready(function() {
$("#leftmenu_dashboard").bind("click", function(event) {
selectLeftMenu($(this), false);
selectLeftMenu($(this), false, function() {
clearMiddleMenu();
hideMiddleMenu();
clearMiddleMenu();
hideMiddleMenu();
$("#right_panel").data("onRefreshFn", function() {
$("#leftmenu_dashboard").click();
});
$("#right_panel").data("onRefreshFn", function() {
$("#leftmenu_dashboard").click();
$("#right_panel").load("jsp/dashboard.jsp", function(){
afterLoadDashboardJSP();
});
});
$("#right_panel").load("jsp/dashboard.jsp", function(){
afterLoadDashboardJSP();
});
return false;
});
$("#leftmenu_storage").bind("click", function(event) {
@ -163,6 +160,10 @@ $(document).ready(function() {
resourceLoadPage("jsp/resource.jsp", null);
return false;
});
//Setup domain
bindEventHandlerToDomainTreeNode();
drawRootNode(g_domainid);
}
$("#midmenu_action_link").bind("mouseover", function(event) {

10
ui/scripts/cloud.core.js
View File

@ -594,7 +594,7 @@ function clearRightPanel() {
var $selectedLeftMenu;
var $expandedLeftMenu;
function selectLeftMenu($menuToSelect, expandable) {
function selectLeftMenu($menuToSelect, expandable, afterSelectFn) {
if ($selectedLeftMenu == null || ($menuToSelect.attr("id") != $selectedLeftMenu.attr("id"))) {
if($selectedLeftMenu != null) {
$selectedLeftMenu.removeClass("selected");
@ -611,13 +611,13 @@ function selectLeftMenu($menuToSelect, expandable) {
}
if ($expandedLeftMenu != null) {
$expandedLeftMenu.slideUp(500, function() {
//if ($menuToExpand != null) $menuToExpand.slideDown(200);
});
$expandedLeftMenu.slideUp(500, afterSelectFn);
if ($menuToExpand != null) $menuToExpand.slideDown(500);
$expandedLeftMenu = null;
} else if ($menuToExpand != null) {
$menuToExpand.slideDown(500);
$menuToExpand.slideDown(500, afterSelectFn);
} else if (afterSelectFn != undefined) {
afterSelectFn();
}
$expandedLeftMenu = $menuToExpand;