From bceff4068f28ac70391f74045372f2751287c2ca Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 23 Dec 2010 10:30:08 -0800
Subject: [PATCH] new Advanced Search - fix a bug that advanced search dialog
 didn't appear when clicking the same type of submenu (e.g. "my accounts",
 "all accounts").

---
 ui/jsp/account.jsp            | 46 ++++++++++++++++----------------
 ui/jsp/iso.jsp                | 50 ++++++++++++++++++-----------------
 ui/jsp/template.jsp           | 50 ++++++++++++++++++-----------------
 ui/scripts/cloud.core.init.js |  7 +++--
 ui/scripts/cloud.core.js      |  4 +--
 5 files changed, 80 insertions(+), 77 deletions(-)

diff --git a/ui/jsp/account.jsp b/ui/jsp/account.jsp
index 2284f2ff7d1..07015049da6 100644
--- a/ui/jsp/account.jsp
+++ b/ui/jsp/account.jsp
@@ -776,26 +776,26 @@
 
 <!-- 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" id="adv_search_name" value="by name"/>
-                        
-                    </li>
-                    <li>
-                        <select class="select" id="adv_search_role">
-                            <option value=""></option>                    
-                            <option value="0">User</option>
-                            <option value="2">Domain-Admin</option>
-                            <option value="1">Admin</option>
-                        </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>
+                    <select class="select" id="adv_search_role">
+                        <option value=""></option>
+                        <option value="0">User</option>
+                        <option value="2">Domain-Admin</option>
+                        <option value="1">Admin</option>
+                    </select>
+                </li>
+            </ol>
+            </form>
+        </div>
+    </div>    
+    <!-- advanced search popup (end) -->
+</div>
diff --git a/ui/jsp/iso.jsp b/ui/jsp/iso.jsp
index d18bf44ab87..cf7d5c90223 100644
--- a/ui/jsp/iso.jsp
+++ b/ui/jsp/iso.jsp
@@ -392,28 +392,30 @@
     </p>
 </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" 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 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="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/template.jsp b/ui/jsp/template.jsp
index 25d48ee28e7..65207c71d21 100644
--- a/ui/jsp/template.jsp
+++ b/ui/jsp/template.jsp
@@ -408,28 +408,30 @@
     </p>
 </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" 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 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="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/scripts/cloud.core.init.js b/ui/scripts/cloud.core.init.js
index 5f66583baf4..75d58290a69 100644
--- a/ui/scripts/cloud.core.init.js
+++ b/ui/scripts/cloud.core.init.js
@@ -274,7 +274,8 @@ $(document).ready(function() {
 	            $("#advanced_search_container").find("#advanced_search_popup").slideDown("500");
 	        }
 	        else {	
-	            var $advancedSearchPopup = $("#advanced_search_popup");
+	            var $advancedSearchPopup = $("#hidden_container").find("#advanced_search_popup");
+	            $("#advanced_search_container").append($advancedSearchPopup.slideDown("500"));	 
         	    
 	            $advancedSearchPopup.unbind("click").bind("click", function(event) {
 	                var $target = $(event.target);
@@ -389,9 +390,7 @@ $(document).ready(function() {
 	                });		    
 	            } 	  
         	    	      
-	            $advancedSearchPopup.find("#adv_search_startdate, #adv_search_enddate").datepicker({dateFormat: 'yy-mm-dd'});
-        	    	    	    
-	            $("#advanced_search_container").empty().append($advancedSearchPopup.slideDown("500"));	 
+	            $advancedSearchPopup.find("#adv_search_startdate, #adv_search_enddate").datepicker({dateFormat: 'yy-mm-dd'});	            
 	        }
 	    }
 	    	   
diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index 86e8afecf9b..cab5718986c 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -557,8 +557,8 @@ function clearMiddleMenu() {
     $("#midmenu_action_link").hide();    
     lastSearchType = null;
     $("#basic_search").find("#search_input").val("");
-    $("#advanced_search_icon").removeClass("up");
-    $("#advanced_search_container").empty();
+    $("#advanced_search_icon").removeClass("up");    
+    $("#advanced_search_container").find("#advanced_search_popup").hide().appendTo($("#hidden_container"));    
     $("#midmenu_prevbutton, #midmenu_nextbutton").hide();
     $("#middle_menu_pagination").data("params", null);
 }