From 0fe40e4ba45319bec8418e8358b22ff902b015c6 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 6 Dec 2010 14:58:20 -0800
Subject: [PATCH] Add two submenu links under Account - My Account (user,
 domain-admin, admin), All Accounts (domain-admin, admin).

---
 ui/index.jsp                  | 48 ++++++++++++++++++++---------------
 ui/scripts/cloud.core.init.js |  6 +++--
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/ui/index.jsp b/ui/index.jsp
index 4a0eb646d17..8034a5f6584 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -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">
diff --git a/ui/scripts/cloud.core.init.js b/ui/scripts/cloud.core.init.js
index 49884f9487a..9af730ee483 100644
--- a/ui/scripts/cloud.core.init.js
+++ b/ui/scripts/cloud.core.init.js
@@ -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);