From 9075d56863d1d2a5abd7dc5f12539815ee03cd3a Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 2 Dec 2010 12:28:03 -0800
Subject: [PATCH] Account page - implement basic search and advanced search.

---
 ui/jsp/account.jsp               | 35 +++++++++++++++++++++++++++++++-
 ui/scripts/cloud.core.account.js | 23 +++++++++++++++++++--
 2 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/ui/jsp/account.jsp b/ui/jsp/account.jsp
index b642b991eb5..f589764aaab 100644
--- a/ui/jsp/account.jsp
+++ b/ui/jsp/account.jsp
@@ -200,4 +200,37 @@
     <p>
         <%=t.t("please.confirm.you.want.to.enable.account")%>        
     </p>
-</div>
\ No newline at end of file
+</div>
+
+<!-- advanced search template (begin) -->
+<div id="advanced_search_template" class="adv_searchpopup" style="display: none;">
+    <div class="adv_searchformbox">
+        <h3>
+            Advance Search</h3>
+        <a id="advanced_search_close" href="#">Close </a>
+        <form action="#" method="post">
+        <ol>
+            <li>
+                <label>
+                    Name:</label>
+                <input class="text" type="text" id="adv_search_name" />
+            </li>
+            <li>
+                <label>
+                    Role:</label>
+                <select class="select" id="adv_search_role">
+                    <option value=""></option>                    
+                    <option value="0">User</option>
+                    <option value="2">Domain-Admin</option>
+                    <option value="1">Admin</option>
+                </select>
+            </li>
+        </ol>
+        </form>
+        <div class="adv_search_actionbox">
+            <div class="adv_searchpopup_button" id="adv_search_button">
+            </div>
+        </div>
+    </div>
+</div>
+<!-- advanced search template (end) -->
\ No newline at end of file
diff --git a/ui/scripts/cloud.core.account.js b/ui/scripts/cloud.core.account.js
index 7c46cf50a69..c60db02456d 100644
--- a/ui/scripts/cloud.core.account.js
+++ b/ui/scripts/cloud.core.account.js
@@ -19,8 +19,27 @@
 var systemAccountId = 1;
 var adminAccountId = 2;
 
-function accountGetSearchParams() {
-    return "";
+function accountGetSearchParams() {
+    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 && name.length > 0) 
+			moreCriteria.push("&name="+todb(name));	
+		
+		var role = $advancedSearchPopup.find("#adv_search_role").val();	
+		if (role != null && role.length > 0) 
+				moreCriteria.push("&accounttype="+role);	
+	} 
+	else {     			    		
+	    var searchInput = $("#basic_search").find("#search_input").val();	 
+        if (lastSearchType == "basic_search" && searchInput != null && searchInput.length > 0) {	           
+            moreCriteria.push("&name="+todb(searchInput));	       
+        }        
+	}
+	
+	return moreCriteria.join("");          
 }
 
 function afterLoadAccountJSP() {