From bf377735c4c061a478addbe9078c9dce1661226e Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 22 Oct 2010 14:31:47 -0700
Subject: [PATCH] new UI - instance page - hide routers tab for non-admin user.

---
 ui/new/jsp/instance.jsp                | 4 ++--
 ui/new/scripts/cloud.core2.instance.js | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ui/new/jsp/instance.jsp b/ui/new/jsp/instance.jsp
index 12338d81ac1..e826901cb2f 100644
--- a/ui/new/jsp/instance.jsp
+++ b/ui/new/jsp/instance.jsp
@@ -26,7 +26,7 @@
             <%=t.t("Volume")%></div>
         <div class="content_tabs off" id="tab_statistics">
             <%=t.t("Statistics")%></div>
-        <div class="content_tabs off" id="tab_router">
+        <div class="content_tabs off" id="tab_router" style="display:none">
             <%=t.t("Routers")%></div>
     </div>
     <!--Details tab (start)-->
@@ -183,7 +183,7 @@
     </div>
     <!--Statistics tab (start)-->
     <!--Routers tab (start)-->
-    <div style="display: none;" id="tab_content_router">
+    <div style="display: none;" id="tab_content_router" style="display:none">
         Routers
     </div>
     <!--Routers tab (start)-->
diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js
index b2bc961f239..f778fe1fa6b 100644
--- a/ui/new/scripts/cloud.core2.instance.js
+++ b/ui/new/scripts/cloud.core2.instance.js
@@ -53,6 +53,9 @@ function clickInstanceGroupHeader($arrowIcon) {
            
     //***** VM Detail (end) ********************************************************************************    
     $("#right_panel").load("jsp/instance.jsp", function() {	           
+	    if (isAdmin() || isDomainAdmin())
+	        $("#right_panel_content").find("#tab_router,#tab_router").show();
+	    
 	    var $noDiskOfferingTemplate = $("#vm_popup_disk_offering_template_no");
         var $customDiskOfferingTemplate = $("#vm_popup_disk_offering_template_custom");
         var $existingDiskOfferingTemplate = $("#vm_popup_disk_offering_template_existing");
@@ -1220,7 +1223,9 @@ function vmToRightPanel($midmenuItem) {
     
     vmJsonToDetailsTab(jsonObj, $midmenuItem);   
     vmJsonToVolumeTab(jsonObj);
-    vmJsonToRouterTab(jsonObj);
+    
+    if (isAdmin() || isDomainAdmin())
+        vmJsonToRouterTab(jsonObj);
 }
  
 function vmJsonToDetailsTab(jsonObj, $midmenuItem){