From cecf4f9a5ebddcdb2b18c95d8b266dce7aa35a55 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Sat, 23 Oct 2010 10:44:45 -0700
Subject: [PATCH] new UI - instance page - show different submenu at left
 navigation based on user role (admin, non-admin).

---
 ui/new/scripts/cloud.core2.init.js     | 12 +---
 ui/new/scripts/cloud.core2.instance.js | 77 ++++++++------------------
 2 files changed, 25 insertions(+), 64 deletions(-)

diff --git a/ui/new/scripts/cloud.core2.init.js b/ui/new/scripts/cloud.core2.init.js
index 11eb4a9fce4..9af47083156 100644
--- a/ui/new/scripts/cloud.core2.init.js
+++ b/ui/new/scripts/cloud.core2.init.js
@@ -89,17 +89,7 @@ $(document).ready(function() {
 		instanceBuildSubMenu();
 		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) {
 		selectLeftMenu($(this), true);
 		hideMiddleMenu();		
diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js
index 8249bf51474..f517571ac3c 100644
--- a/ui/new/scripts/cloud.core2.instance.js
+++ b/ui/new/scripts/cloud.core2.instance.js
@@ -20,27 +20,31 @@ var $instanceSubMenuContainer;
 function instanceBuildSubMenu() {    
     $instanceSubMenuContainer = $("#leftmenu_instance_expandedbox").empty();    
   
-    instanceBuildSubMenu2("My Instances", ("listVirtualMachines&domainid="+g_domainid+"&account="+g_account));
-    instanceBuildSubMenu2("All Instances", "listVirtualMachines");   
-    
-    instanceBuildSubMenu2("Running Instances", "listVirtualMachines&state=Running");
-    instanceBuildSubMenu2("Stopped Instances", "listVirtualMachines&state=Stopped");
-    instanceBuildSubMenu2("Destoryed Instances", "listVirtualMachines&state=Destroyed");
-    
-    
-    $.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++) {		                
-	                instanceBuildSubMenu2(instancegroups[i].name, ("listVirtualMachines&groupid="+instancegroups[i].id));   
+    if (isAdmin() || isDomainAdmin()) {
+        instanceBuildSubMenu2("My Instances", ("listVirtualMachines&domainid="+g_domainid+"&account="+g_account));
+        instanceBuildSubMenu2("All Instances", "listVirtualMachines");           
+        instanceBuildSubMenu2("Running Instances", "listVirtualMachines&state=Running");
+        instanceBuildSubMenu2("Stopped Instances", "listVirtualMachines&state=Stopped");
+        instanceBuildSubMenu2("Destoryed Instances", "listVirtualMachines&state=Destroyed");
+    } 	
+    else if(isUser()) {	        
+        instanceBuildSubMenu2("All Instances", "listVirtualMachines");           
+        instanceBuildSubMenu2("Running Instances", "listVirtualMachines&state=Running");
+        instanceBuildSubMenu2("Stopped Instances", "listVirtualMachines&state=Stopped");        
+        $.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++) {		                
+	                    instanceBuildSubMenu2(instancegroups[i].name, ("listVirtualMachines&groupid="+instancegroups[i].id));   
+	                }
 	            }
-	        }
-        }
-    });  
+            }
+        });  
+    }    
 }
 
 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) ******************************************************************************
 var noGroupName = "default";