From bc8b7ed1ae14c824aa24a128970313f2192f3c70 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 27 Dec 2010 12:08:35 -0800
Subject: [PATCH] Snapshot page - implement new advanced search.

---
 ui/jsp/snapshot.jsp               |  6 +-----
 ui/scripts/cloud.core.snapshot.js | 11 ++++-------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/ui/jsp/snapshot.jsp b/ui/jsp/snapshot.jsp
index 6c56aefc8c6..bcaaafab7e0 100644
--- a/ui/jsp/snapshot.jsp
+++ b/ui/jsp/snapshot.jsp
@@ -203,11 +203,7 @@
     <div id="advanced_search_popup" class="adv_searchpopup_bg" style="display: none;">
         <div class="adv_searchformbox">
             <form action="#" method="post">
-            <ol>
-                <li>
-                    <input class="text textwatermark" type="text" name="adv_search_name" id="adv_search_name"
-                        value="by name" />
-                </li>
+            <ol>                
                 <li id="adv_search_domain_li" style="display: none;">
                     <select class="select" id="adv_search_domain">
                     </select>
diff --git a/ui/scripts/cloud.core.snapshot.js b/ui/scripts/cloud.core.snapshot.js
index bc66fb09f3f..5cc5b177c56 100644
--- a/ui/scripts/cloud.core.snapshot.js
+++ b/ui/scripts/cloud.core.snapshot.js
@@ -24,19 +24,16 @@ function snapshotGetSearchParams() {
         moreCriteria.push("&keyword="+todb(searchInput));	       
     }     
 
-	var $advancedSearchPopup = $("#advanced_search_popup");
-	if (lastSearchType == "advanced_search" && $advancedSearchPopup.length > 0) {
-	    var name = $advancedSearchPopup.find("#adv_search_name").val();							
-		if (name!=null && trim(name).length > 0) 
-			moreCriteria.push("&name="+todb(name));		
-        
+	var $advancedSearchPopup = getAdvancedSearchPopupInSearchContainer();
+	if ($advancedSearchPopup.length > 0 && $advancedSearchPopup.css("display") != "none" ) {
         if ($advancedSearchPopup.find("#adv_search_domain_li").css("display") != "none") {		
 		    var domainId = $advancedSearchPopup.find("#adv_search_domain").val();		
 		    if (domainId!=null && domainId.length > 0) 
 			    moreCriteria.push("&domainid="+domainId);	
     	}	
     	
-		if ($advancedSearchPopup.find("#adv_search_account_li").css("display") != "none") {	
+		if ($advancedSearchPopup.find("#adv_search_account_li").css("display") != "none" 
+    	    && $advancedSearchPopup.find("#adv_search_account").hasClass("textwatermark") == false) {
 		    var account = $advancedSearchPopup.find("#adv_search_account").val();		
 		    if (account!=null && account.length > 0) 
 			    moreCriteria.push("&account="+account);