From a6a00fbfdcf51960075ab91fd1ad6b8b29315534 Mon Sep 17 00:00:00 2001
From: NIKITA <nikita@cloud.com>
Date: Mon, 20 Dec 2010 17:18:35 -0800
Subject: [PATCH] Revised Advance Search UI for Host, IPAddress, security
 Group, service offering, template, volume

---
 ui/jsp/host.jsp            | 82 +++++++++++++++-----------------------
 ui/jsp/ipaddress.jsp       | 60 ++++++++++------------------
 ui/jsp/securitygroup.jsp   | 42 +++++++------------
 ui/jsp/serviceoffering.jsp | 41 ++++++-------------
 ui/jsp/template.jsp        | 60 ++++++++++------------------
 ui/jsp/volume.jsp          | 59 ++++++++++-----------------
 6 files changed, 121 insertions(+), 223 deletions(-)

diff --git a/ui/jsp/host.jsp b/ui/jsp/host.jsp
index 6affb4291cd..2ad11fb3c69 100644
--- a/ui/jsp/host.jsp
+++ b/ui/jsp/host.jsp
@@ -1062,56 +1062,38 @@
 
 
 <!-- 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>
-                    <label>Status:</label>
-                    <select class="select" id="adv_search_state">
-                        <option value=""></option>
-                        <option value="Up">Up</option>
-                        <option value="Down">Down</option>
-                        <option value="Disconnected">Disconnected</option>
-                        <option value="Updating">Updating</option>
-                        <option value="Alert">Alert</option>
-                        <option value="PrepareForMaintenance">PrepareForMaintenance</option>
-                        <option value="Maintenance">Maintenance</option>
-                        <option value="ErrorInMaintenance">ErrorInMaintenance</option>
-                    </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>
-                        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 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>
+                        <select class="select" id="adv_search_state">
+                            <option value=""></option>
+                            <option value="Up">Up</option>
+                            <option value="Down">Down</option>
+                            <option value="Disconnected">Disconnected</option>
+                            <option value="Updating">Updating</option>
+                            <option value="Alert">Alert</option>
+                            <option value="PrepareForMaintenance">PrepareForMaintenance</option>
+                            <option value="Maintenance">Maintenance</option>
+                            <option value="ErrorInMaintenance">ErrorInMaintenance</option>
+                        </select>
+                    </li>
+                    
+                    <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>
-    <div class="adv_searchpopup_bot"></div>
 </div>
 <!-- advanced search template (end) -->
diff --git a/ui/jsp/ipaddress.jsp b/ui/jsp/ipaddress.jsp
index 51182f71cc9..82c164ee05f 100644
--- a/ui/jsp/ipaddress.jsp
+++ b/ui/jsp/ipaddress.jsp
@@ -710,45 +710,27 @@
 
 
 <!-- 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">
-                        IP:</label>
-                    <input class="text" type="text" name="adv_search_name" id="adv_search_ipaddress" />
-                </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_ipaddress"  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) -->
diff --git a/ui/jsp/securitygroup.jsp b/ui/jsp/securitygroup.jsp
index 945b906fa3e..0f828fbc76a 100644
--- a/ui/jsp/securitygroup.jsp
+++ b/ui/jsp/securitygroup.jsp
@@ -295,34 +295,20 @@
 <!-- Add Security Group Dialog (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>
-                    <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/serviceoffering.jsp b/ui/jsp/serviceoffering.jsp
index 5516179afb4..91963a73606 100644
--- a/ui/jsp/serviceoffering.jsp
+++ b/ui/jsp/serviceoffering.jsp
@@ -264,34 +264,19 @@
 
 
 <!-- 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) -->
\ No newline at end of file
diff --git a/ui/jsp/template.jsp b/ui/jsp/template.jsp
index fb90235c978..7bad44e272e 100644
--- a/ui/jsp/template.jsp
+++ b/ui/jsp/template.jsp
@@ -410,44 +410,26 @@
 
 
 <!-- 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>
-    <div class="adv_searchpopup_bot"></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>
 <!-- advanced search template (end) -->
\ No newline at end of file
diff --git a/ui/jsp/volume.jsp b/ui/jsp/volume.jsp
index c04faa8910a..00b58a03916 100644
--- a/ui/jsp/volume.jsp
+++ b/ui/jsp/volume.jsp
@@ -733,45 +733,26 @@
 <!-- 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 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="textwatermark" />
+                    </li>
+                </ol>
+                </form>
          </div>
-    </div>
-    <div class="adv_searchpopup_bot"></div>
 </div>
 <!-- advanced search template (end) -->
\ No newline at end of file