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

Add two submenu links under Account - My Account (user, domain-admin, admin), All Accounts (domain-admin, admin).

This commit is contained in:
Jessica Wang 2010-12-06 14:58:20 -08:00
parent dca59ce324
commit 0fe40e4ba4
2 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
ui/index.jsp
View File

@ -269,26 +269,7 @@
</div>
</div>
</div>
<!--
<div class="actionpanel_button_wrapper" id="midmenu_add2_link" style="display: none;">
<div class="actionpanel_button">
<div class="actionpanel_button_icons">
<img src="images/addvm_actionicon.png" alt="Add" /></div>
<div class="actionpanel_button_links" id="label">
<fmt:message key="label.add"/>
</div>
</div>
</div>
<div class="actionpanel_button_wrapper" id="midmenu_add3_link" style="display: none;">
<div class="actionpanel_button">
<div class="actionpanel_button_icons">
<img src="images/addvm_actionicon.png" alt="Add" /></div>
<div class="actionpanel_button_links" id="label">
<fmt:message key="label.add"/>
</div>
</div>
</div>
-->
<div class="actionpanel_button_wrapper" id="midmenu_startvm_link" style="display: none;">
<div class="actionpanel_button">
<div class="actionpanel_button_icons">
@ -635,12 +616,37 @@
<div class="leftmenu_list">
<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_arrows_firstlevel_open" id="expandable_first_level_arrow" style="display:none;"></div>
<div class="leftmenu_list_icons">
<img src="images/accounts_leftmenuicon.png" alt="Accounts" /></div>
<fmt:message key="label.menu.accounts"/>
</div>
</div>
<div id="leftmenu_account_expandedbox" class="leftmenu_expandedbox" style="display: none">
<div class="leftmenu_expandedlist" id="leftmenu_account_my_accounts_container">
<div class="leftmenu_content" id="leftmenu_account_my_accounts">
<div class="leftmenu_secondindent">
<div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon">
</div>
<span id="label">
My Accounts
</span>
</div>
</div>
</div>
<div class="leftmenu_expandedlist" id="leftmenu_account_all_accounts_container">
<div class="leftmenu_content" id="leftmenu_account_all_accounts">
<div class="leftmenu_secondindent">
<div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon">
</div>
<span id="label">
All Accounts
</span>
</div>
</div>
</div>
</div>
</div>
<div class="leftmenu_list">

6
ui/scripts/cloud.core.init.js
View File

@ -46,8 +46,7 @@ $(document).ready(function() {
return false;
});
$("#leftmenu_account").bind("click", function(event) {
selectLeftMenu($(this), false);
listMidMenuItems("listAccounts", accountGetSearchParams, "listaccountsresponse", "account", "jsp/account.jsp", afterLoadAccountJSP, accountToMidmenu, accountToRightPanel, getMidmenuId, false, "leftmenu_account");
selectLeftMenu($(this), true);
return false;
});
@ -116,6 +115,9 @@ $(document).ready(function() {
bindAndListMidMenuItems($("#leftmenu_submenu_featured_iso"), "listIsos&isofilter=featured", isoGetSearchParams, "listisosresponse", "iso", "jsp/iso.jsp", afterLoadIsoJSP, isoToMidmenu, isoToRightPanel, isoGetMidmenuId, false);
bindAndListMidMenuItems($("#leftmenu_submenu_community_iso"), "listIsos&isofilter=community", isoGetSearchParams, "listisosresponse", "iso", "jsp/iso.jsp", afterLoadIsoJSP, isoToMidmenu, isoToRightPanel, isoGetMidmenuId, false);
bindAndListMidMenuItems($("#leftmenu_account_my_accounts"), "listAccounts&domainid="+g_domainid+"&name="+g_account, accountGetSearchParams, "listaccountsresponse", "account", "jsp/account.jsp", afterLoadAccountJSP, accountToMidmenu, accountToRightPanel, getMidmenuId, false);
bindAndListMidMenuItems($("#leftmenu_account_all_accounts"), "listAccounts", accountGetSearchParams, "listaccountsresponse", "account", "jsp/account.jsp", afterLoadAccountJSP, accountToMidmenu, accountToRightPanel, getMidmenuId, false);
bindAndListMidMenuItems($("#leftmenu_service_offering"), "listServiceOfferings", serviceOfferingGetSearchParams, "listserviceofferingsresponse", "serviceoffering", "jsp/serviceoffering.jsp", afterLoadServiceOfferingJSP, serviceOfferingToMidmenu, serviceOfferingToRightPanel, getMidmenuId, false);
bindAndListMidMenuItems($("#leftmenu_disk_offering"), "listDiskOfferings", diskOfferingGetSearchParams, "listdiskofferingsresponse", "diskoffering", "jsp/diskoffering.jsp", afterLoadDiskOfferingJSP, diskOfferingToMidmenu, diskOfferingToRightPanel, getMidmenuId, false);