From a242235dacf314781afaacb330ca761d92a9e543 Mon Sep 17 00:00:00 2001
From: NIKITA <nikita@cloud.com>
Date: Mon, 20 Dec 2010 16:39:35 -0800
Subject: [PATCH] Revised UI for Advance Search in Router and Snapshots tab

---
 ui/jsp/router.jsp   | 32 ++++++--------------------------
 ui/jsp/snapshot.jsp | 25 +++++--------------------
 2 files changed, 11 insertions(+), 46 deletions(-)

diff --git a/ui/jsp/router.jsp b/ui/jsp/router.jsp
index 38353873c20..e86ba51515a 100644
--- a/ui/jsp/router.jsp
+++ b/ui/jsp/router.jsp
@@ -180,23 +180,14 @@
 
 
 <!-- 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>
@@ -212,36 +203,25 @@
                     </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>
                 <li id="adv_search_domain_li" style="display: none;">
-                    <label>
-                        Domain:</label>
                     <select class="select" id="adv_search_domain">
                     </select>
                 </li>
                 <li id="adv_search_account_li" style="display: none;">
-                    <label>
-                        Account:</label>
-                    <input class="text" type="text" id="adv_search_account" />
+                    <input class="text textwatermark" type="text" id="adv_search_account" value="by account" />
                 </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
diff --git a/ui/jsp/snapshot.jsp b/ui/jsp/snapshot.jsp
index c7860bbb7aa..30dedebded9 100644
--- a/ui/jsp/snapshot.jsp
+++ b/ui/jsp/snapshot.jsp
@@ -193,40 +193,25 @@
 <!-- Create template from snapshot (end) -->
 
 <!-- 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" name="adv_search_name" id="adv_search_name" />
+                    <input class="text textwatermark" type="text" name="adv_search_name" id="adv_search_name" value="by name" />
                 </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" />
+                    <input class="text textwatermark" type="text" id="adv_search_account"  value="by account"/>
                 </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) -->