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

new UI - instance page - hide routers tab for non-admin user.

This commit is contained in:
Jessica Wang 2010-10-22 14:31:47 -07:00
parent e6f7a480ae
commit bf377735c4
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/new/jsp/instance.jsp
View File

@ -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)-->

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

@ -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){