From 193a4f6f71a943264c2bb1aa340c5c19164c8f58 Mon Sep 17 00:00:00 2001
From: NIKITA <nikita@cloud.com>
Date: Mon, 20 Dec 2010 16:51:55 -0800
Subject: [PATCH] Revised Advance Search UI for Network Offering and SystemVM

---
 ui/jsp/networkoffering.jsp | 19 +++----------------
 ui/jsp/systemvm.jsp        | 22 +++-------------------
 2 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/ui/jsp/networkoffering.jsp b/ui/jsp/networkoffering.jsp
index 19f692727e1..5272167b249 100644
--- a/ui/jsp/networkoffering.jsp
+++ b/ui/jsp/networkoffering.jsp
@@ -163,23 +163,17 @@
 
 
 <!-- advanced search template (begin) -->
-<div id="advanced_search_template" class="adv_searchpopup" style="display: none;">
-    <div class="adv_searchpopup_top">
-    	<h2>Advance Search</h2>
-    </div>
-    
-    <div class="adv_searchpopup_mid">
+<div id="advanced_search_template" class="adv_searchpopup_bg" style="display: none;">
         <div class="adv_searchformbox">
             <form action="#" method="post">
             <ol>
                 <li>
                     <label>
                         Name:</label>
-                    <input class="text" type="text" id="adv_search_name" />
+                    <input class="text textwatermark" type="text" id="adv_search_name" value="by name"/>
                 </li>
                 
                 <li>
-                    <label>Availability:</label>
                     <select class="select" id="adv_search_availability">
                         <option value=""></option>
                         <option value="Required">Required</option>
@@ -189,7 +183,6 @@
                 </li>
                 
                 <li>
-                    <label>Type:</label>
                     <select class="select" id="adv_search_type">
                         <option value=""></option>
                         <option value="Virtual">Virtual</option>
@@ -199,7 +192,7 @@
                 </li>
                 
                 <li>
-                    <label>Traffic Type:</label>
+
                     <select class="select" id="adv_search_traffictype">
                         <option value=""></option>
                         <option value="Public">Public</option>
@@ -213,13 +206,7 @@
                
             </ol>
             </form>
-            <div class="adv_search_actionbox">
-                <div class="adv_searchpopup_button" id="adv_search_button">
-                </div>
-            </div>
           </div>
-    </div>
-    <div class="adv_searchpopup_bot"></div>
 </div>
 <!-- advanced search template (end) -->
 
diff --git a/ui/jsp/systemvm.jsp b/ui/jsp/systemvm.jsp
index 61a5f969ba4..4e67fce2de9 100644
--- a/ui/jsp/systemvm.jsp
+++ b/ui/jsp/systemvm.jsp
@@ -206,23 +206,16 @@
 
 
 <!-- advanced search template (begin) -->
-<div id="advanced_search_template" class="adv_searchpopup" style="display: none;">
-    <div class="adv_searchpopup_top">
-    	<h2>Advance Search</h2>
-    </div>
-    
-    <div class="adv_searchpopup_mid">
+<div id="advanced_search_template" class="adv_searchpopup_bg" style="display: none;">
         <div class="adv_searchformbox">
             <form action="#" method="post">
             <ol>
                 <li>
                     <label>
                         Name:</label>
-                    <input class="text" type="text" id="adv_search_name" />
+                    <input class="text textwatermark" type="text" id="adv_search_name" value="by name" />
                 </li>
                 <li>
-                    <label>
-                        Status:</label>
                     <select class="select" id="adv_search_state">
                         <option value=""></option>
                         <option value="Creating">Creating</option>
@@ -238,25 +231,16 @@
                     </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>
-    <div class="adv_searchpopup_bot"></div>
+
 </div>
 <!-- advanced search template (end) -->
\ No newline at end of file