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

---
 ui/jsp/template.jsp               |  6 +-----
 ui/scripts/cloud.core.template.js | 24 ++++++++++--------------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/ui/jsp/template.jsp b/ui/jsp/template.jsp
index 65207c71d21..e1ade9d1ee9 100644
--- a/ui/jsp/template.jsp
+++ b/ui/jsp/template.jsp
@@ -413,11 +413,7 @@
     <div class="adv_searchpopup_bg" id="advanced_search_popup" 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>
                     <select class="select" id="adv_search_zone">
                     </select>
diff --git a/ui/scripts/cloud.core.template.js b/ui/scripts/cloud.core.template.js
index 15ec79757ef..547ff38da62 100644
--- a/ui/scripts/cloud.core.template.js
+++ b/ui/scripts/cloud.core.template.js
@@ -24,12 +24,13 @@ var g_zoneNames = [];
 function templateGetSearchParams() {
     var moreCriteria = [];	
 
-	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 searchInput = $("#basic_search").find("#search_input").val();	 
+    if (searchInput != null && searchInput.length > 0) {	           
+        moreCriteria.push("&keyword="+todb(searchInput));	       
+    }     
+
+	var $advancedSearchPopup = getAdvancedSearchPopupInSearchContainer();
+	if ($advancedSearchPopup.length > 0 && $advancedSearchPopup.css("display") != "none" ) {		   
 		var zone = $advancedSearchPopup.find("#adv_search_zone").val();	
 	    if (zone!=null && zone.length > 0) 
 			moreCriteria.push("&zoneId="+zone);	
@@ -40,18 +41,13 @@ function templateGetSearchParams() {
 			    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);		
 		}	
-	} 
-	else {     			    		
-	    var searchInput = $("#basic_search").find("#search_input").val();	 
-        if (lastSearchType == "basic_search" && searchInput != null && searchInput.length > 0) {	           
-            moreCriteria.push("&keyword="+todb(searchInput));	       
-        }        
-	}
+	} 	
 	
 	return moreCriteria.join("");          
 }