diff --git a/ui/index.jsp b/ui/index.jsp index 9cb0e3aad9a..52e0365e80b 100644 --- a/ui/index.jsp +++ b/ui/index.jsp @@ -704,6 +704,41 @@ long milliseconds = new Date().getTime(); + + +
+ + +
+ + + diff --git a/ui/scripts/cloud.core.init.js b/ui/scripts/cloud.core.init.js index d06407812f6..b2a273f770f 100644 --- a/ui/scripts/cloud.core.init.js +++ b/ui/scripts/cloud.core.init.js @@ -35,7 +35,16 @@ $(document).ready(function() { $("#leftmenu_resource").click(); //if resource menu is open (i.e. zonetree is shown), empty zonetree and close resource menu. } return false; - }); + }); + + $("#leftmenu_resources").bind("click", function(event) { + if (selectLeftMenu($(this), true)) { + if($("#leftmenu_physical_resource").find("#physical_resource_arrow").hasClass("expanded_open") == true) + $("#leftmenu_physical_resource").click(); //if resource menu is open (i.e. zonetree is shown), empty zonetree and close resource menu. + } + return false; + }); + $("#leftmenu_domain").bind("click", function(event) { if (selectLeftMenu($(this), true)) { hideMiddleMenu(); diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js index b61a5cc52d2..48fea8747ba 100644 --- a/ui/scripts/cloud.core.js +++ b/ui/scripts/cloud.core.js @@ -1002,7 +1002,7 @@ function handleErrorInDialog(XMLHttpResponse, $thisDialog) { function showLeftNavigationBasedOnRole() { if (isAdmin()) { - $("#leftmenu_domain, #leftmenu_account, #leftmenu_system, #leftmenu_alert_container, #launch_test").show(); + $("#leftmenu_domain, #leftmenu_account, #leftmenu_system, #leftmenu_resources, #leftmenu_alert_container, #launch_test").show(); } else if(isDomainAdmin()){ $("#leftmenu_domain, #leftmenu_account").show();