From f8f5ad8f6fe3d6b36c153fe323e2365d4259a5ec Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 3 Jan 2011 10:01:38 -0800
Subject: [PATCH] Primary Storage page - add basic search and advanced search.

---
 ui/jsp/primarystorage.jsp               | 22 ++++++++++++++++++++++
 ui/scripts/cloud.core.primarystorage.js | 13 +++----------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/ui/jsp/primarystorage.jsp b/ui/jsp/primarystorage.jsp
index 64b023eca28..6b8089fa430 100644
--- a/ui/jsp/primarystorage.jsp
+++ b/ui/jsp/primarystorage.jsp
@@ -308,3 +308,25 @@
         <%=t.t("please.confirm.you.want.to.delete.the.primary.storage")%>
     </p>
 </div>
+
+
+<div id="hidden_container">
+    <!-- advanced search popup (begin) -->
+    <div class="adv_searchpopup_bg" id="advanced_search_popup" style="display: none;">
+        <div class="adv_searchformbox">
+            <form action="#" method="post">
+            <ol>                  
+                <li>
+                    <select class="select" id="adv_search_zone">
+                    </select>
+                </li>
+                <li id="adv_search_pod_li" style="display: none;">
+                    <select class="select" id="adv_search_pod">
+                    </select>
+                </li>
+            </ol>
+            </form>
+        </div>
+    </div>
+    <!-- advanced search popup (end) -->
+</div>
diff --git a/ui/scripts/cloud.core.primarystorage.js b/ui/scripts/cloud.core.primarystorage.js
index ce69c8a2d1e..dcddbf9fc13 100644
--- a/ui/scripts/cloud.core.primarystorage.js
+++ b/ui/scripts/cloud.core.primarystorage.js
@@ -19,20 +19,14 @@
 
 function primarystorageGetSearchParams() {
     var moreCriteria = [];	
-   
-    /*
+       
 	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 state = $advancedSearchPopup.find("#adv_search_state").val();				
-	    if (state!=null && state.length > 0) 
-		    moreCriteria.push("&state="+todb(state));	
-        
+	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);	
@@ -43,8 +37,7 @@ function primarystorageGetSearchParams() {
 			    moreCriteria.push("&podId="+pod);
         }
 	} 
-	*/
-			
+				
 	return moreCriteria.join("");          
 }