From aa4bc2b4a09477b1b692c78eb562ce38974df085 Mon Sep 17 00:00:00 2001
From: NIKITA <nikita@cloud.com>
Date: Fri, 17 Dec 2010 11:37:03 -0800
Subject: [PATCH] New Advance Search UI for ISO, ROuter, Service Offering

---
 ui/jsp/iso.jsp             |  72 +++++++++++-----------
 ui/jsp/router.jsp          | 120 +++++++++++++++++++------------------
 ui/jsp/serviceoffering.jsp |  52 ++++++++--------
 3 files changed, 128 insertions(+), 116 deletions(-)

diff --git a/ui/jsp/iso.jsp b/ui/jsp/iso.jsp
index 8e311ae1165..e07bca0177a 100644
--- a/ui/jsp/iso.jsp
+++ b/ui/jsp/iso.jsp
@@ -380,40 +380,44 @@
 
 <!-- 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 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_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>
+    <div class="adv_searchpopup_bot"></div>
 </div>
 <!-- advanced search template (end) -->
\ No newline at end of file
diff --git a/ui/jsp/router.jsp b/ui/jsp/router.jsp
index 81c3bf31112..38353873c20 100644
--- a/ui/jsp/router.jsp
+++ b/ui/jsp/router.jsp
@@ -39,7 +39,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>
@@ -181,63 +181,67 @@
 
 <!-- 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>
-			    <label>
-			        Status:</label>
-			    <select class="select" id="adv_search_state">
-			        <option value=""></option>
-			        <option value="Creating">Creating</option>
-			        <option value="Starting">Starting</option>
-			        <option value="Running">Running</option>
-			        <option value="Stopping">Stopping</option>
-			        <option value="Stopped">Stopped</option>
-			        <option value="Destroyed">Destroyed</option>
-			        <option value="Expunging">Expunging</option>
-			        <option value="Migrating">Migrating</option>
-			        <option value="Error">Error</option>
-			        <option value="Unknown">Unknown</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 id="adv_search_pod_label">
-                    Pod:</label>
-                <select class="select" id="adv_search_pod">
-                </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 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="Creating">Creating</option>
+                        <option value="Starting">Starting</option>
+                        <option value="Running">Running</option>
+                        <option value="Stopping">Stopping</option>
+                        <option value="Stopped">Stopped</option>
+                        <option value="Destroyed">Destroyed</option>
+                        <option value="Expunging">Expunging</option>
+                        <option value="Migrating">Migrating</option>
+                        <option value="Error">Error</option>
+                        <option value="Unknown">Unknown</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 id="adv_search_pod_label">
+                        Pod:</label>
+                    <select class="select" id="adv_search_pod">
+                    </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>
 <!-- advanced search template (end) -->
\ No newline at end of file
diff --git a/ui/jsp/serviceoffering.jsp b/ui/jsp/serviceoffering.jsp
index e7545f5b3a7..a6d10599b34 100644
--- a/ui/jsp/serviceoffering.jsp
+++ b/ui/jsp/serviceoffering.jsp
@@ -39,7 +39,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="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>
@@ -251,29 +251,33 @@
 
 <!-- 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) -->
\ No newline at end of file