etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

new UI - login - when login as user, system/domain/account page won't show. When login as domain-admin, system page won't show.

This commit is contained in:
Jessica Wang 2010-11-01 11:57:02 -07:00
parent 4dfee6cff3
commit 98e1f99f51
2 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/new/index.jsp
View File

@ -561,7 +561,7 @@ long milliseconds = new Date().getTime();
</div>
</div>
<div class="leftmenu_list">
<div class="leftmenu_content_flevel" id="leftmenu_account">
<div class="leftmenu_content_flevel" id="leftmenu_account" style="display: none">
<div class="leftmenu_firstindent">
<!-- <div class="leftmenu_arrows_firstlevel_open" id="expandable_first_level_arrow" style="display:none;"></div> -->
<div class="leftmenu_list_icons">
@ -572,7 +572,7 @@ long milliseconds = new Date().getTime();
</div>
<div class="leftmenu_list">
<div class="leftmenu_content_flevel" id="leftmenu_domain">
<div class="leftmenu_content_flevel" id="leftmenu_domain" style="display: none">
<div class="leftmenu_firstindent">
<div class="leftmenu_arrows_firstlevel_open" id="expandable_first_level_arrow" style="display:none;"></div>
<div class="leftmenu_list_icons">
@ -627,7 +627,7 @@ long milliseconds = new Date().getTime();
</div>
</div>
<div class="leftmenu_list">
<div class="leftmenu_content_flevel" id="leftmenu_system">
<div class="leftmenu_content_flevel" id="leftmenu_system" style="display: none">
<div class="leftmenu_firstindent">
<div class="leftmenu_arrows_firstlevel_open" id="expandable_first_level_arrow" style="display:none;"></div>
<div class="leftmenu_list_icons">

62
ui/new/scripts/cloud.core2.init.js
View File

@ -29,6 +29,32 @@ $(document).ready(function() {
);
// Setup first level navigation
$("#leftmenu_system").bind("click", function(event) {
if (selectLeftMenu($(this), true)) {
if($("#leftmenu_resource").find("#resource_arrow").hasClass("expanded_open") == true)
$("#leftmenu_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();
disableMultipleSelectionInMidMenu();
clearMiddleMenu();
bindEventHandlerToDomainTreeNode();
refreshWholeTree(g_domainid, defaultRootLevel);
}
return false;
});
$("#leftmenu_account").bind("click", function(event) {
if (selectLeftMenu($(this))) {
listMidMenuItems("listAccounts", "listaccountsresponse", "account", "jsp/account.jsp", afterLoadAccountJSP, accountToMidmenu, accountToRightPanel, getMidmenuId, false);
}
return false;
});
$("#leftmenu_dashboard").bind("click", function(event) {
if (selectLeftMenu($(this))) {
clearMiddleMenu();
@ -50,42 +76,18 @@ $(document).ready(function() {
$("#leftmenu_templates").bind("click", function(event) {
selectLeftMenu($(this), true);
return false;
});
$("#leftmenu_account").bind("click", function(event) {
if (selectLeftMenu($(this))) {
listMidMenuItems("listAccounts", "listaccountsresponse", "account", "jsp/account.jsp", afterLoadAccountJSP, accountToMidmenu, accountToRightPanel, getMidmenuId, false);
}
return false;
});
$("#leftmenu_events").bind("click", function(event) {
selectLeftMenu($(this), true);
return false;
});
$("#leftmenu_system").bind("click", function(event) {
if (selectLeftMenu($(this), true)) {
if($("#leftmenu_resource").find("#resource_arrow").hasClass("expanded_open") == true)
$("#leftmenu_resource").click(); //if resource menu is open (i.e. zonetree is shown), empty zonetree and close resource menu.
}
return false;
});
$("#leftmenu_instances").bind("click", function(event) {
instanceBuildSubMenu();
selectLeftMenu($(this), true);
return false;
});
$("#leftmenu_domain").bind("click", function(event) {
if (selectLeftMenu($(this), true)) {
hideMiddleMenu();
disableMultipleSelectionInMidMenu();
clearMiddleMenu();
bindEventHandlerToDomainTreeNode();
refreshWholeTree(g_domainid, defaultRootLevel);
}
return false;
});
// Setup 2nd level navigation
function buildSecondLevelNavigation() {
@ -375,9 +377,15 @@ $(document).ready(function() {
$("#main_username").text(g_username);
$("#login_wrapper").hide();
if (isAdmin()) {
if (isAdmin()) {
$("#leftmenu_domain, #leftmenu_account, #leftmenu_system").show();
$("#launch_test").show();
} else {
}
else if(isDomainAdmin()){
$("#leftmenu_domain, #leftmenu_account").show();
$("#launch_test").hide();
}
else{ //isUser() == true
$("#launch_test").hide();
}
$("#main").show();