From b1f9231a82f6f31d47eef581c5ff402b08ea2fd3 Mon Sep 17 00:00:00 2001
From: NIKITA <nikita@cloud.com>
Date: Fri, 17 Dec 2010 11:10:45 -0800
Subject: [PATCH] Advance Search for Alert and Diskoffering

---
 ui/jsp/alert.jsp        | 38 ++++++++++++++++-------------
 ui/jsp/diskoffering.jsp | 53 ++++++++++++++++++++++-------------------
 2 files changed, 50 insertions(+), 41 deletions(-)

diff --git a/ui/jsp/alert.jsp b/ui/jsp/alert.jsp
index 8220c89472b..def7234dfc8 100644
--- a/ui/jsp/alert.jsp
+++ b/ui/jsp/alert.jsp
@@ -85,23 +85,27 @@
 
 <!-- advanced search template (begin) -->
 <div id="advanced_search_template" class="adv_searchpopup" style="display: none;">
-    <div class="adv_searchformbox">
-        <h3>
-            Advance Search</h3>
-        <a id="advanced_search_close" href="#">Close </a>
-        <form action="#" method="post">
-        <ol>
-            <li>
-                <label>
-                    Type:</label>
-                <input class="text" type="text" id="adv_search_type" />
-            </li>            
-        </ol>
-        </form>
-        <div class="adv_search_actionbox">
-            <div class="adv_searchpopup_button" id="adv_search_button">
-            </div>
-        </div>
+    <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>
+                        Type:</label>
+                    <input class="text" type="text" id="adv_search_type" />
+                </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/diskoffering.jsp b/ui/jsp/diskoffering.jsp
index 027dad90419..1c3fd73d014 100644
--- a/ui/jsp/diskoffering.jsp
+++ b/ui/jsp/diskoffering.jsp
@@ -40,7 +40,7 @@
 	        <div class="grid_container">
 	        	<div class="grid_header">
 	            	<div id="grid_header_title" class="grid_header_title">(title)</div>
-	                <div id="action_link" class="grid_actionbox" id="account_action_link">
+	                <div id="action_link" class="grid_actionbox">
 	                    <div class="grid_actionsdropdown_box" id="action_menu" style="display: none;">
 	                        <ul class="actionsdropdown_boxlist" id="action_list">
 	                        	<li><%=t.t("no.available.actions")%></li>
@@ -200,29 +200,34 @@
 
 <!-- advanced search template (begin) -->
 <div id="advanced_search_template" class="adv_searchpopup" style="display: none;">
-    <div class="adv_searchformbox">
-        <h3>
-            Advance Search</h3>
-        <a id="advanced_search_close" href="#">Close </a>
-        <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_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>
+    </div>
+    <div class="adv_searchpopup_bot"></div>
 </div>
 <!-- advanced search template (end) -->