From df9cc101db31d755bdbe3132e6bc788a2a191096 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 2 Dec 2010 10:13:43 -0800
Subject: [PATCH] instance page - advanced search - remove state dropdown field
 since we have filter menu on left navigation already ("Running Instances",
 "Stopped Instances", "Destroyed Instances").

---
 ui/jsp/instance.jsp               | 12 +++++++-----
 ui/scripts/cloud.core.instance.js |  2 ++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ui/jsp/instance.jsp b/ui/jsp/instance.jsp
index fd38119e372..0cd5dc52508 100644
--- a/ui/jsp/instance.jsp
+++ b/ui/jsp/instance.jsp
@@ -1363,12 +1363,13 @@
         <form action="#" method="post">
         <ol>
             <li>
-                <label for="filter">
+                <label>
                     Name:</label>
                 <input class="text" type="text" name="adv_search_name" id="adv_search_name" />
             </li>
+            <!--  
             <li>
-                <label for="filter">
+                <label>
                     Status:</label>
                 <select class="select" id="adv_search_state">
                     <option value=""></option>
@@ -1384,20 +1385,21 @@
                     <option value="Unknown">Unknown</option>
                 </select>
             </li>
+            -->
             <li>
-                <label for="filter">
+                <label>
                     Zone:</label>
                 <select class="select" id="adv_search_zone">
                 </select>
             </li>            
             <li id="adv_search_domain_li" style="display: none;">
-                <label for="filter">
+                <label>
                     Domain:</label>
                 <select class="select" id="adv_search_domain">
                 </select>
             </li>
             <li id="adv_search_account_li" style="display: none;">
-                <label for="filter">
+                <label>
                     Account:</label>
                 <input class="text" type="text" id="adv_search_account" />
             </li>
diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js
index 143fe719ecd..55cc5ce90e7 100644
--- a/ui/scripts/cloud.core.instance.js
+++ b/ui/scripts/cloud.core.instance.js
@@ -25,9 +25,11 @@ function vmGetSearchParams() {
 		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)