From 2680b8ca12be6efcd17cfbc3f8c1e5a68869b0b5 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 2 Dec 2010 15:34:01 -0800
Subject: [PATCH] System VM page - implement basic search and advanced search.

---
 ui/jsp/systemvm.jsp               | 53 +++++++++++++++++++++++++++++++
 ui/scripts/cloud.core.systemvm.js | 31 +++++++++++++++++-
 2 files changed, 83 insertions(+), 1 deletion(-)

diff --git a/ui/jsp/systemvm.jsp b/ui/jsp/systemvm.jsp
index b7fd09d1790..6c83bd254dd 100644
--- a/ui/jsp/systemvm.jsp
+++ b/ui/jsp/systemvm.jsp
@@ -203,3 +203,56 @@
         <%=t.t("please.confirm.you.want.to.reboot.systemVM")%>
     </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>
+                    Name:</label>
+                <input class="text" type="text" id="adv_search_name" />
+            </li>
+            <li>
+			    <label>
+			        Status:</label>
+			    <select class="select" id="adv_search_state">
+			        <option value=""></option>
+			        <option value="Creating">Creating</option>
+			        <option value="Starting">Starting</option>
+			        <option value="Running">Running</option>
+			        <option value="Stopping">Stopping</option>
+			        <option value="Stopped">Stopped</option>
+			        <option value="Destroyed">Destroyed</option>
+			        <option value="Expunging">Expunging</option>
+			        <option value="Migrating">Migrating</option>
+			        <option value="Error">Error</option>
+			        <option value="Unknown">Unknown</option>
+			    </select>
+			</li>            
+            <li>
+                <label>
+                    Zone:</label>
+                <select class="select" id="adv_search_zone">
+                </select>
+            </li>
+            <li id="adv_search_pod_li" style="display: none;">
+                <label id="adv_search_pod_label">
+                    Pod:</label>
+                <select class="select" id="adv_search_pod">
+                </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.systemvm.js b/ui/scripts/cloud.core.systemvm.js
index 298687e9118..ac30d95aea1 100644
--- a/ui/scripts/cloud.core.systemvm.js
+++ b/ui/scripts/cloud.core.systemvm.js
@@ -17,7 +17,36 @@
  */
  
  function systemVmGetSearchParams() {
-     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 state = $advancedSearchPopup.find("#adv_search_state").val();
+		if (state!=null && state.length > 0) 
+			moreCriteria.push("&state="+todb(state));		
+				
+		var zone = $advancedSearchPopup.find("#adv_search_zone").val();	
+	    if (zone!=null && zone.length > 0) 
+			moreCriteria.push("&zoneId="+zone);	
+		
+		if ($advancedSearchPopup.find("#adv_search_pod_li").css("display") != "none") {	
+		    var pod = $advancedSearchPopup.find("#adv_search_pod").val();		
+	        if (pod!=null && pod.length > 0) 
+			    moreCriteria.push("&podId="+pod);
+        }       
+	} 
+	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 afterLoadSystemVmJSP($midmenuItem1) {