From e82573dbf06e70fa864aca07e3c760ee29f44894 Mon Sep 17 00:00:00 2001
From: NIKITA <nikita@cloud.com>
Date: Mon, 20 Dec 2010 17:04:10 -0800
Subject: [PATCH] Revised Advance Search UI for Disk oFeering, Instance, ISO,
 network

---
 ui/jsp/diskoffering.jsp | 42 +++++++---------------
 ui/jsp/instance.jsp     | 78 ++++++++---------------------------------
 ui/jsp/iso.jsp          | 60 +++++++++++--------------------
 ui/jsp/network.jsp      | 42 ++++++++--------------
 4 files changed, 62 insertions(+), 160 deletions(-)

diff --git a/ui/jsp/diskoffering.jsp b/ui/jsp/diskoffering.jsp
index c86c0971772..15f666ba681 100644
--- a/ui/jsp/diskoffering.jsp
+++ b/ui/jsp/diskoffering.jsp
@@ -213,35 +213,19 @@
 </div>
 
 <!-- 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 class="adv_searchformbox">
-            <form action="#" method="post">
-            <ol>
-                <li>
-                    <label>
-                        Name:</label>
-                    <input class="text" type="text" id="adv_search_name" />
-                </li>           
-                <li id="adv_search_domain_li" style="display: none;">
-                    <label>
-                        Domain:</label>
-                    <select class="select" id="adv_search_domain">
-                    </select>
-                </li>           
-            </ol>
-            </form>
-        
-            <div class="adv_search_actionbox">
-                <div class="adv_searchpopup_button" id="adv_search_button">
-                </div>
-            </div>
+<div class="adv_searchpopup_bg" id="advanced_search_template" style="display:none;">
+            <div class="adv_searchformbox">
+                <form action="#" method="post">
+                <ol>
+                    <li>
+                        <input class="text textwatermark" type="text" id="adv_search_name" value="by name" />
+                    </li>           
+                    <li id="adv_search_domain_li" style="display: none;">
+                        <select class="select" id="adv_search_domain">
+                        </select>
+                    </li>           
+                </ol>
+                </form>
          </div>
-    </div>
-    <div class="adv_searchpopup_bot"></div>
 </div>
 <!-- advanced search template (end) -->
diff --git a/ui/jsp/instance.jsp b/ui/jsp/instance.jsp
index fec678812cc..c8246c98942 100644
--- a/ui/jsp/instance.jsp
+++ b/ui/jsp/instance.jsp
@@ -1531,23 +1531,14 @@
 <!--  ***** Dialogs (end) ***** -->
 
 <!-- advanced search templates (begin) -->
-<div id="advanced_search_template_general" 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_general" 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>
-                    <label>
-                        Status:</label>
                     <select class="select" id="adv_search_state">
                         <option value=""></option>
                         <option value="Creating">Creating</option>
@@ -1563,92 +1554,58 @@
                     </select>
                 </li>            
                 <li>
-                    <label>
-                        Zone:</label>
                     <select class="select" id="adv_search_zone">
                     </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>
 
-<div id="advanced_search_template_nostate" 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_nostate" 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>
-                    <label>
-                        Zone:</label>
+
                     <select class="select" id="adv_search_zone">
                     </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" />
                 </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>
 
-<div id="advanced_search_template_nodomainaccount" 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_nodomainaccount" 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>
-                    <label>
-                        Status:</label>
+
                     <select class="select" id="adv_search_state">
                         <option value=""></option>
                         <option value="Creating">Creating</option>
@@ -1664,19 +1621,12 @@
                     </select>
                 </li>            
                 <li>
-                    <label>
-                        Zone:</label>
+
                     <select class="select" id="adv_search_zone">
                     </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 templates (end) -->
\ No newline at end of file
diff --git a/ui/jsp/iso.jsp b/ui/jsp/iso.jsp
index 59933c5738f..6a7f117410e 100644
--- a/ui/jsp/iso.jsp
+++ b/ui/jsp/iso.jsp
@@ -393,45 +393,27 @@
 </div>
 
 <!-- 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 class="adv_searchformbox">
-            <form action="#" method="post">
-            <ol>
-                <li>
-                    <label for="filter">
-                        Name:</label>
-                    <input class="text" type="text" name="adv_search_name" id="adv_search_name" />
-                </li>
-                <li>
-                    <label for="filter">
-                        Zone:</label>
-                    <select class="select" id="adv_search_zone">
-                    </select>
-                </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" />
-                </li>
-            </ol>
-            </form>
-            <div class="adv_search_actionbox">
-                <div class="adv_searchpopup_button" id="adv_search_button">
-                </div>
-            </div>
+<div class="adv_searchpopup_bg" id="advanced_search_template" style="display:none;">
+            <div class="adv_searchformbox">
+                <form action="#" method="post">
+                    <ol>
+                        <li>
+                            <input class="text textwatermark" type="text" name="adv_search_name" id="adv_search_name" value="by name"/>
+                        </li>
+                        <li>
+                            <select class="select" id="adv_search_zone">
+                            </select>
+                        </li>            
+                        <li id="adv_search_domain_li" style="display: none;">
+                            <select class="select" id="adv_search_domain">
+                            </select>
+                        </li>
+                        <li id="adv_search_account_li" style="display: none;">
+                            <input class="text textwatermark" type="text" id="adv_search_account" value="by account" />
+                        </li>
+                    </ol>
+                </form>
+      
          </div>
-    </div>
-    <div class="adv_searchpopup_bot"></div>
 </div>
 <!-- advanced search template (end) -->
\ No newline at end of file
diff --git a/ui/jsp/network.jsp b/ui/jsp/network.jsp
index 6936009e11e..77d10e2cebb 100644
--- a/ui/jsp/network.jsp
+++ b/ui/jsp/network.jsp
@@ -1010,34 +1010,20 @@
 <!-- Add network dialog for zone (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 class="adv_searchformbox">
-            <form action="#" method="post">
-            <ol>            
-                <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" />
-                </li>
-            </ol>
-            </form>
-            <div class="adv_search_actionbox">
-                <div class="adv_searchpopup_button" id="adv_search_button">
-                </div>
-            </div>
+<div class="adv_searchpopup_bg" id="advanced_search_template" style="display:none;">
+            <div class="adv_searchformbox">
+                <form action="#" method="post">
+                    <ol>            
+                        <li id="adv_search_domain_li" style="display: none;">
+                            <select class="select" id="adv_search_domain">
+                            </select>
+                        </li>
+                        <li id="adv_search_account_li" style="display: none;">
+
+                            <input class="text textwatermark" type="text" id="adv_search_account" value="by account" />
+                        </li>
+                    </ol>
+                </form>
          </div>
-    </div>
-     <div class="adv_searchpopup_bot"></div>
 </div>
 <!-- advanced search template (end) -->
\ No newline at end of file