From 2d70fb25dded3a7f0d32de63852214a4064b4041 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 2 Dec 2010 11:40:47 -0800
Subject: [PATCH] ISO page - implement basic search and advanced search.

---
 ui/jsp/iso.jsp               | 39 ++++++++++++++++++++++++++++++++++++
 ui/scripts/cloud.core.iso.js | 33 +++++++++++++++++++++++++++++-
 2 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/ui/jsp/iso.jsp b/ui/jsp/iso.jsp
index 28e9b1bb442..76149c1424a 100644
--- a/ui/jsp/iso.jsp
+++ b/ui/jsp/iso.jsp
@@ -353,3 +353,42 @@
     </p>
 </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 for="filter">
+                    Name:</label>
+                <input class="text" type="text" name="adv_search_name" id="adv_search_name" />
+            </li>
+            <li>
+                <label for="filter">
+                    Zone:</label>
+                <select class="select" id="adv_search_zone">
+                </select>
+            </li>            
+            <li id="adv_search_domain_li" style="display: none;">
+                <label for="filter">
+                    Domain:</label>
+                <select class="select" id="adv_search_domain">
+                </select>
+            </li>
+            <li id="adv_search_account_li" style="display: none;">
+                <label for="filter">
+                    Account:</label>
+                <input class="text" type="text" id="adv_search_account" />
+            </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.iso.js b/ui/scripts/cloud.core.iso.js
index de4bdc96b08..70b1a77e59a 100644
--- a/ui/scripts/cloud.core.iso.js
+++ b/ui/scripts/cloud.core.iso.js
@@ -22,7 +22,38 @@ var g_zoneIds = [];
 var g_zoneNames = [];	
 
 function isoGetSearchParams() {
-    return "";
+    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 zone = $advancedSearchPopup.find("#adv_search_zone").val();	
+	    if (zone!=null && zone.length > 0) 
+			moreCriteria.push("&zoneId="+zone);	
+				
+        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") {	
+		    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("&name="+todb(searchInput));	       
+        }        
+	}
+	
+	return moreCriteria.join("");          
 }
 
 function afterLoadIsoJSP() {