From 65d7ff0fe9078495ee2386f9f36c83e3e4d63d47 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 10 Feb 2011 13:40:54 -0800
Subject: [PATCH] bug 8497: click anywhere in left menu "Isos" would
 collapse/expand sub-items (My Isos, Featured Isos, Community Isos). So would
 left menu "Templates".

---
 ui/index.jsp                  |  4 ++--
 ui/scripts/cloud.core.init.js | 28 +++++++++-------------------
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/ui/index.jsp b/ui/index.jsp
index e5fb559bcb1..8625678e514 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -458,7 +458,7 @@
                         <div id="leftmenu_itemplate_filter">
                             <div class="leftmenu_content" id="leftmenu_template_filter_header">
                                 <div class="leftmenu_secondindent">
-                                    <div class="leftmenu_arrows expanded_open" id="template_arrow">
+                                    <div class="leftmenu_arrows expanded_open" id="arrow_icon">
                                     </div>
                                     
                                     <fmt:message key="label.menu.templates"/>
@@ -500,7 +500,7 @@
                         <div id="leftmenu_iso_filter">
                             <div class="leftmenu_content" id="leftmenu_iso_filter_header">
                                 <div class="leftmenu_secondindent">
-                                    <div class="leftmenu_arrows expanded_open" id="iso_arrow">
+                                    <div class="leftmenu_arrows expanded_open" id="arrow_icon">
                                     </div>
                                     
                                     <fmt:message key="label.menu.isos"/>
diff --git a/ui/scripts/cloud.core.init.js b/ui/scripts/cloud.core.init.js
index 62d0a410910..a03ea766b4b 100644
--- a/ui/scripts/cloud.core.init.js
+++ b/ui/scripts/cloud.core.init.js
@@ -292,26 +292,16 @@ $(document).ready(function() {
 			return false;
 		});
 				
-		$("#template_arrow").unbind("click").bind("click", function(event) {	
-		    if($(this).hasClass("expanded_open")) { 
-		        $("#leftmenu_template_filter_container").hide();
-		        $(this).removeClass("expanded_open").addClass("expanded_close");
+		$("#leftmenu_template_filter_header, #leftmenu_iso_filter_header").unbind("click").bind("click", function(event) {	
+		    var $arrowIcon = $(this).find("#arrow_icon");		    
+		    var $subItemContainer = $(this).next();
+		    if($arrowIcon.hasClass("expanded_open")) { 		        
+		        $subItemContainer.hide();
+		        $arrowIcon.removeClass("expanded_open").addClass("expanded_close");
 		    }
-		    else if($(this).hasClass("expanded_close")) {
-		        $("#leftmenu_template_filter_container").show();
-		        $(this).removeClass("expanded_close").addClass("expanded_open");
-		    }
-		    return false;
-		});
-		
-		$("#iso_arrow").unbind("click").bind("click", function(event) {	
-		    if($(this).hasClass("expanded_open")) { 
-		        $("#leftmenu_iso_filter_container").hide();
-		        $(this).removeClass("expanded_open").addClass("expanded_close");
-		    }
-		    else if($(this).hasClass("expanded_close")) {
-		        $("#leftmenu_iso_filter_container").show();
-		        $(this).removeClass("expanded_close").addClass("expanded_open");
+		    else if($arrowIcon.hasClass("expanded_close")) {
+		        $subItemContainer.show();
+		        $arrowIcon.removeClass("expanded_close").addClass("expanded_open");
 		    }
 		    return false;
 		});