apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

new UI - instance page - show different submenu at left navigation based on user role (admin, non-admin).

Browse Source
This commit is contained in:
Jessica Wang 2010-10-23 10:44:45 -07:00
parent d4dfc6770b
commit cecf4f9a5e
2 changed files with 25 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,17 +89,7 @@ $(document).ready(function() {
instanceBuildSubMenu(); instanceBuildSubMenu();
return false; return false;
}); });
/*
$("#leftmenu_instance_group_header").bind("click", function(event) {
showMiddleMenu();
clearMiddleMenu();
enableMultipleSelectionInMidMenu(); //multiple-selection is needeed for actions like start VM, stop VM, reboot VM.
var $arrowIcon = $(this).find("#arrow_icon");
clickInstanceGroupHeader($arrowIcon);
return false;
});
*/
$("#leftmenu_domain").bind("click", function(event) { $("#leftmenu_domain").bind("click", function(event) {
selectLeftMenu($(this), true); selectLeftMenu($(this), true);
hideMiddleMenu(); hideMiddleMenu();

77
ui/new/scripts/cloud.core2.instance.js
View File

@ -20,27 +20,31 @@ var $instanceSubMenuContainer;
function instanceBuildSubMenu() { function instanceBuildSubMenu() {
$instanceSubMenuContainer = $("#leftmenu_instance_expandedbox").empty(); $instanceSubMenuContainer = $("#leftmenu_instance_expandedbox").empty();
instanceBuildSubMenu2("My Instances", ("listVirtualMachines&domainid="+g_domainid+"&account="+g_account)); if (isAdmin() || isDomainAdmin()) {
instanceBuildSubMenu2("All Instances", "listVirtualMachines"); instanceBuildSubMenu2("My Instances", ("listVirtualMachines&domainid="+g_domainid+"&account="+g_account));
instanceBuildSubMenu2("All Instances", "listVirtualMachines");
instanceBuildSubMenu2("Running Instances", "listVirtualMachines&state=Running"); instanceBuildSubMenu2("Running Instances", "listVirtualMachines&state=Running");
instanceBuildSubMenu2("Stopped Instances", "listVirtualMachines&state=Stopped"); instanceBuildSubMenu2("Stopped Instances", "listVirtualMachines&state=Stopped");
instanceBuildSubMenu2("Destoryed Instances", "listVirtualMachines&state=Destroyed"); instanceBuildSubMenu2("Destoryed Instances", "listVirtualMachines&state=Destroyed");
}
else if(isUser()) {
$.ajax({ instanceBuildSubMenu2("All Instances", "listVirtualMachines");
cache: false, instanceBuildSubMenu2("Running Instances", "listVirtualMachines&state=Running");
data: createURL("command=listInstanceGroups"), instanceBuildSubMenu2("Stopped Instances", "listVirtualMachines&state=Stopped");
dataType: "json", $.ajax({
success: function(json) { cache: false,
var instancegroups = json.listinstancegroupsresponse.instancegroup; data: createURL("command=listInstanceGroups"),
if(instancegroups!=null && instancegroups.length>0) { dataType: "json",
for(var i=0; i < instancegroups.length; i++) { success: function(json) {
instanceBuildSubMenu2(instancegroups[i].name, ("listVirtualMachines&groupid="+instancegroups[i].id)); var instancegroups = json.listinstancegroupsresponse.instancegroup;
if(instancegroups!=null && instancegroups.length>0) {
for(var i=0; i < instancegroups.length; i++) {
instanceBuildSubMenu2(instancegroups[i].name, ("listVirtualMachines&groupid="+instancegroups[i].id));
}
} }
} }
} });
}); }
} }
function instanceBuildSubMenu2(label, commandString) { function instanceBuildSubMenu2(label, commandString) {
@ -643,39 +647,6 @@ function afterLoadInstanceJSP() {
}); });
} }
/*
function clickInstanceGroupHeader($arrowIcon) {
if($arrowIcon.hasClass("expanded_close") == true) {
$arrowIcon.removeClass("expanded_close").addClass("expanded_open");
appendInstanceGroup(-1, noGroupName);
$.ajax({
cache: false,
data: createURL("command=listInstanceGroups"),
dataType: "json",
success: function(json) {
var instancegroups = json.listinstancegroupsresponse.instancegroup;
if(instancegroups!=null && instancegroups.length>0) {
for(var i=0; i < instancegroups.length; i++) {
appendInstanceGroup(instancegroups[i].id, fromdb(instancegroups[i].name));
}
}
}
});
}
else if($arrowIcon.hasClass("expanded_open") == true) {
$arrowIcon.removeClass("expanded_open").addClass("expanded_close");
$("#leftmenu_instance_group_container").empty();
}
}
*/
//***** VM Detail (begin) ****************************************************************************** //***** VM Detail (begin) ******************************************************************************
var noGroupName = "default"; var noGroupName = "default";