From fbac12bf4c20acbb0105c235a4357f5ceb7e41b3 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 23 Dec 2010 11:17:15 -0800
Subject: [PATCH] instance page - advanced search.

---
 ui/jsp/instance.jsp           |  2 +-
 ui/scripts/cloud.core.init.js | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ui/jsp/instance.jsp b/ui/jsp/instance.jsp
index b7c542ff8ee..591fb253c63 100644
--- a/ui/jsp/instance.jsp
+++ b/ui/jsp/instance.jsp
@@ -1490,7 +1490,7 @@
 
 <div id="hidden_container">
     <!-- advanced search popup (begin) -->
-    <div id="advanced_search_popup_general" class="adv_searchpopup_bg" style="display: none;">
+    <div id="advanced_search_popup" class="adv_searchpopup_bg" style="display: none;">
         <div class="adv_searchformbox">
             <form action="#" method="post">
             <ol>
diff --git a/ui/scripts/cloud.core.init.js b/ui/scripts/cloud.core.init.js
index 75d58290a69..9461be407ae 100644
--- a/ui/scripts/cloud.core.init.js
+++ b/ui/scripts/cloud.core.init.js
@@ -262,6 +262,13 @@ $(document).ready(function() {
 	});
 	
 	//advanced search	
+    var LeftMenuAdvancedSearchMap = {
+        "leftmenu_instances_my_instances": "advanced_search_popup_nodomainaccount",
+        "leftmenu_instances_running_instances": "advanced_search_popup_nostate",
+        "leftmenu_instances_stopped_instances": "advanced_search_popup_nostate",
+        "leftmenu_instances_destroyed_instances": "advanced_search_popup_nostate"
+    }	
+		
 	$("#advanced_search_icon").unbind("click").bind("click", function(event) {
 	    if($(this).hasClass("up")) {  //clicking up-arrow          
 	        $("#advanced_search_container").find("#advanced_search_popup").slideUp("500");
@@ -273,8 +280,13 @@ $(document).ready(function() {
 	        if($("#advanced_search_container").find("#advanced_search_popup").length > 0) {
 	            $("#advanced_search_container").find("#advanced_search_popup").slideDown("500");
 	        }
-	        else {	
-	            var $advancedSearchPopup = $("#hidden_container").find("#advanced_search_popup");
+	        else {		            
+	            var $advancedSearchPopup;
+	            if(currentLeftMenuId in LeftMenuAdvancedSearchMap)
+	                $advancedSearchPopup = $("#hidden_container").find("#"+LeftMenuAdvancedSearchMap[currentLeftMenuId]);
+	            else
+	                $advancedSearchPopup = $("#hidden_container").find("#advanced_search_popup");  //default
+	                
 	            $("#advanced_search_container").append($advancedSearchPopup.slideDown("500"));	 
         	    
 	            $advancedSearchPopup.unbind("click").bind("click", function(event) {