From 5159e181e3f211fbd0ecaea38cfa675842a0778e Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 23 Dec 2010 10:53:15 -0800
Subject: [PATCH] new advanced search - move advanced search dialog back to
 hidden conainer when advanced search dialog is closed.

---
 ui/jsp/alert.jsp           | 15 ++++++-----
 ui/jsp/diskoffering.jsp    | 35 +++++++++++++-----------
 ui/jsp/event.jsp           | 12 +++++----
 ui/jsp/instance.jsp        | 54 ++++++++++++++++++--------------------
 ui/jsp/ipaddress.jsp       | 52 ++++++++++++++++++------------------
 ui/jsp/network.jsp         | 34 +++++++++++++-----------
 ui/jsp/router.jsp          | 15 +++++------
 ui/jsp/securitygroup.jsp   | 36 +++++++++++++------------
 ui/jsp/serviceoffering.jsp | 36 +++++++++++++------------
 ui/jsp/snapshot.jsp        | 17 ++++++------
 ui/jsp/systemvm.jsp        | 17 ++++++------
 ui/jsp/volume.jsp          | 49 ++++++++++++++++++----------------
 12 files changed, 193 insertions(+), 179 deletions(-)

diff --git a/ui/jsp/alert.jsp b/ui/jsp/alert.jsp
index e03d4c30025..b73fc6f8c50 100644
--- a/ui/jsp/alert.jsp
+++ b/ui/jsp/alert.jsp
@@ -82,17 +82,18 @@
 </div>
 <!-- alert detail panel (end) -->
 
-
-<!-- advanced search template (begin) -->
-<div id="advanced_search_popup" class="adv_searchpopup_bg" style="display: none;">
-    	<div class="adv_searchformbox">
+<div id="hidden_container">
+    <!-- advanced search popup (begin) -->
+    <div id="advanced_search_popup" class="adv_searchpopup_bg" style="display: none;">
+        <div class="adv_searchformbox">
             <form action="#" method="post">
             <ol>
                 <li>
                     <input class="text textwatermark" type="text" id="adv_search_type" value="by type" />
-                </li>            
+                </li>
             </ol>
             </form>
-         </div>
+        </div>
+    </div>
+    <!-- advanced search popup (end) -->
 </div>
-<!-- advanced search template (end) -->
\ No newline at end of file
diff --git a/ui/jsp/diskoffering.jsp b/ui/jsp/diskoffering.jsp
index fd98b3e7a37..6a773926145 100644
--- a/ui/jsp/diskoffering.jsp
+++ b/ui/jsp/diskoffering.jsp
@@ -212,20 +212,23 @@
 	</div>
 </div>
 
-<!-- advanced search template (begin) -->
-<div class="adv_searchpopup_bg" id="advanced_search_popup" 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 id="hidden_container">
+    <!-- advanced search popup (begin) -->
+    <div class="adv_searchpopup_bg" id="advanced_search_popup" 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>
+    <!-- advanced search popup (end) -->
 </div>
-<!-- advanced search template (end) -->
diff --git a/ui/jsp/event.jsp b/ui/jsp/event.jsp
index 54325127894..f5a90a2970a 100644
--- a/ui/jsp/event.jsp
+++ b/ui/jsp/event.jsp
@@ -122,8 +122,9 @@
 </div>
 <!-- event detail panel (end) -->
 
-<!-- advanced search template (begin) -->
-<div id="advanced_search_popup" class="adv_searchpopup_bg" style="display: none;">
+<div id="hidden_container">
+    <!-- advanced search popup (begin) -->
+    <div id="advanced_search_popup" class="adv_searchpopup_bg" style="display: none;">
         <div class="adv_searchformbox">
             <form action="#" method="post">
             <ol>
@@ -157,7 +158,7 @@
                         <option value="NET.IPRELEASE">NET.IPRELEASE</option>
                         <option value="NET.RULEADD">NET.RULEADD</option>
                         <option value="NET.RULEDELETE">NET.RULEDELETE</option>
-                        <option value="NET.RULEMODIFY">NET.RULEMODIFY</option>                   
+                        <option value="NET.RULEMODIFY">NET.RULEMODIFY</option>
                         <option value="PF.SERVICE.APPLY">PF.SERVICE.APPLY</option>
                         <option value="PF.SERVICE.REMOVE">PF.SERVICE.REMOVE</option>
                         <option value="SECGROUP.APPLY">SECGROUP.APPLY</option>
@@ -227,6 +228,7 @@
                 </li>
             </ol>
             </form>
-         </div>
+        </div>
+    </div>
+    <!-- advanced search popup (end) -->
 </div>
-<!-- advanced search template (end) -->
\ No newline at end of file
diff --git a/ui/jsp/instance.jsp b/ui/jsp/instance.jsp
index b4f9f35e68d..b7c542ff8ee 100644
--- a/ui/jsp/instance.jsp
+++ b/ui/jsp/instance.jsp
@@ -1488,14 +1488,16 @@
 
 <!--  ***** Dialogs (end) ***** -->
 
-<!-- advanced search templates (begin) -->
-<div id="advanced_search_popup_general" class="adv_searchpopup_bg" style="display: none;">
+<div id="hidden_container">
+    <!-- advanced search popup (begin) -->
+    <div id="advanced_search_popup_general" class="adv_searchpopup_bg" 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>           
+                    <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_state">
                         <option value=""></option>
@@ -1510,11 +1512,11 @@
                         <option value="Error">Error</option>
                         <option value="Unknown">Unknown</option>
                     </select>
-                </li>            
+                </li>
                 <li>
                     <select class="select" id="adv_search_zone">
                     </select>
-                </li>            
+                </li>
                 <li id="adv_search_domain_li" style="display: none;">
                     <select class="select" id="adv_search_domain">
                     </select>
@@ -1525,22 +1527,19 @@
             </ol>
             </form>
         </div>
-</div>
-
-<div id="advanced_search_popup_nostate" class="adv_searchpopup_bg" style="display: none;">
-
+    </div>
+    <div id="advanced_search_popup_nostate" class="adv_searchpopup_bg" 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>            
+                    <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>
                 <li id="adv_search_domain_li" style="display: none;">
                     <select class="select" id="adv_search_domain">
                     </select>
@@ -1550,20 +1549,17 @@
                 </li>
             </ol>
             </form>
-            
-         </div>
-
-</div>
-
-<div id="advanced_search_popup_nodomainaccount" class="adv_searchpopup_bg" style="display: none;">
+        </div>
+    </div>
+    <div id="advanced_search_popup_nodomainaccount" class="adv_searchpopup_bg" 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>           
+                    <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_state">
                         <option value=""></option>
                         <option value="Creating">Creating</option>
@@ -1577,14 +1573,14 @@
                         <option value="Error">Error</option>
                         <option value="Unknown">Unknown</option>
                     </select>
-                </li>            
+                </li>
                 <li>
-
                     <select class="select" id="adv_search_zone">
                     </select>
-                </li>   
+                </li>
             </ol>
             </form>
-         </div>
+        </div>
+    </div>
+    <!-- advanced search popup (end) -->
 </div>
-<!-- advanced search templates (end) -->
\ No newline at end of file
diff --git a/ui/jsp/ipaddress.jsp b/ui/jsp/ipaddress.jsp
index 972bde336af..92106b37088 100644
--- a/ui/jsp/ipaddress.jsp
+++ b/ui/jsp/ipaddress.jsp
@@ -709,28 +709,30 @@
 <!--  dialogs (end) -->
 
 
-<!-- advanced search template (begin) -->
-<div class="adv_searchpopup_bg" id="advanced_search_popup" 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>
-<!-- advanced search template (end) -->
+<div id="hidden_container">
+    <!-- advanced search popup (begin) -->
+    <div class="adv_searchpopup_bg" id="advanced_search_popup" 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>
+    <!-- advanced search popup (end) -->
+</div>
\ No newline at end of file
diff --git a/ui/jsp/network.jsp b/ui/jsp/network.jsp
index fbd63801b0e..347501b6701 100644
--- a/ui/jsp/network.jsp
+++ b/ui/jsp/network.jsp
@@ -1001,21 +1001,23 @@
 </div>
 <!-- Add network dialog for zone (end) -->
 
-<!-- advanced search template (begin) -->
-<div class="adv_searchpopup_bg" id="advanced_search_popup" 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 id="hidden_container">
+    <!-- advanced search popup (begin) -->
+    <div class="adv_searchpopup_bg" id="advanced_search_popup" 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>
+    <!-- advanced search popup (end) -->
 </div>
-<!-- advanced search template (end) -->
\ No newline at end of file
diff --git a/ui/jsp/router.jsp b/ui/jsp/router.jsp
index 200f65313d6..3d987fb6976 100644
--- a/ui/jsp/router.jsp
+++ b/ui/jsp/router.jsp
@@ -179,8 +179,9 @@
 <!-- view console template (end)  -->
 
 
-<!-- advanced search template (begin) -->
-<div id="advanced_search_popup" class="adv_searchpopup_bg" style="display: none;">
+<div id="hidden_container">
+    <!-- advanced search popup (begin) -->
+    <div id="advanced_search_popup" class="adv_searchpopup_bg" style="display: none;">
         <div class="adv_searchformbox">
             <form action="#" method="post">
             <ol>
@@ -201,13 +202,12 @@
                         <option value="Error">Error</option>
                         <option value="Unknown">Unknown</option>
                     </select>
-                </li>            
+                </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>
@@ -220,8 +220,7 @@
                 </li>
             </ol>
             </form>
-            
-         </div>
-
+        </div>
+    </div>
+    <!-- advanced search popup (end) -->
 </div>
-<!-- advanced search template (end) -->
\ No newline at end of file
diff --git a/ui/jsp/securitygroup.jsp b/ui/jsp/securitygroup.jsp
index e84ff496247..2ffddf96548 100644
--- a/ui/jsp/securitygroup.jsp
+++ b/ui/jsp/securitygroup.jsp
@@ -294,21 +294,23 @@
 </div>
 <!-- Add Security Group Dialog (end) -->
 
-<!-- advanced search template (begin) -->
-<div class="adv_searchpopup_bg" id="advanced_search_popup" 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 id="hidden_container">
+    <!-- advanced search popup (begin) -->
+    <div class="adv_searchpopup_bg" id="advanced_search_popup" 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>
+    <!-- advanced search popup (end) -->
 </div>
-<!-- advanced search template (end) -->
+
diff --git a/ui/jsp/serviceoffering.jsp b/ui/jsp/serviceoffering.jsp
index b063169f69e..aa057e9f65f 100644
--- a/ui/jsp/serviceoffering.jsp
+++ b/ui/jsp/serviceoffering.jsp
@@ -263,20 +263,22 @@
 </div>
 
 
-<!-- advanced search template (begin) -->
-<div class="adv_searchpopup_bg" id="advanced_search_popup" 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>
-<!-- advanced search template (end) -->
\ No newline at end of file
+<div id="hidden_container">
+    <!-- advanced search popup (begin) -->
+    <div class="adv_searchpopup_bg" id="advanced_search_popup" 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>
+    <!-- advanced search popup (end) -->
+</div>
\ No newline at end of file
diff --git a/ui/jsp/snapshot.jsp b/ui/jsp/snapshot.jsp
index 856ba7985b4..6c56aefc8c6 100644
--- a/ui/jsp/snapshot.jsp
+++ b/ui/jsp/snapshot.jsp
@@ -198,28 +198,29 @@
 </div>
 <!-- Create template from snapshot (end) -->
 
-<!-- advanced search template (begin) -->
-<div id="advanced_search_popup" class="adv_searchpopup_bg" style="display: none;">
-
+<div id="hidden_container">
+    <!-- advanced search popup (begin) -->
+    <div id="advanced_search_popup" class="adv_searchpopup_bg" 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" />
+                    <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;">
                     <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"/>
+                    <input class="text textwatermark" type="text" id="adv_search_account" value="by account" />
                 </li>
             </ol>
             </form>
-            
-         </div>
+        </div>
+    </div>
+    <!-- advanced search popup (end) -->
 </div>
-<!-- advanced search template (end) -->
 
 
 
diff --git a/ui/jsp/systemvm.jsp b/ui/jsp/systemvm.jsp
index 079573e014c..e26d484935e 100644
--- a/ui/jsp/systemvm.jsp
+++ b/ui/jsp/systemvm.jsp
@@ -205,8 +205,9 @@
 </div>
 
 
-<!-- advanced search template (begin) -->
-<div id="advanced_search_popup" class="adv_searchpopup_bg" style="display: none;">
+<div id="hidden_container">
+    <!-- advanced search popup (begin) -->
+    <div id="advanced_search_popup" class="adv_searchpopup_bg" style="display: none;">
         <div class="adv_searchformbox">
             <form action="#" method="post">
             <ol>
@@ -227,7 +228,7 @@
                         <option value="Error">Error</option>
                         <option value="Unknown">Unknown</option>
                     </select>
-                </li>            
+                </li>
                 <li>
                     <select class="select" id="adv_search_zone">
                     </select>
@@ -235,10 +236,10 @@
                 <li id="adv_search_pod_li" style="display: none;">
                     <select class="select" id="adv_search_pod">
                     </select>
-                </li>           
+                </li>
             </ol>
             </form>
-         </div>
-
-</div>
-<!-- advanced search template (end) -->
\ No newline at end of file
+        </div>
+    </div>
+    <!-- advanced search popup (end) -->
+</div>
\ No newline at end of file
diff --git a/ui/jsp/volume.jsp b/ui/jsp/volume.jsp
index 1f6906b6986..bcaf6d21e65 100644
--- a/ui/jsp/volume.jsp
+++ b/ui/jsp/volume.jsp
@@ -760,27 +760,30 @@
 </div>
 <!-- Create template from snapshot (end) -->
 
-<!-- advanced search template (begin) -->
-<div class="adv_searchpopup_bg" id="advanced_search_popup" 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 id="hidden_container">
+    <!-- advanced search popup (begin) -->
+    <div class="adv_searchpopup_bg" id="advanced_search_popup" 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>
+    <!-- advanced search popup (end) -->
 </div>
-<!-- advanced search template (end) -->
\ No newline at end of file