From 4bd6d85066b4bedf6b2620f69ef278b1ee7d7983 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 15 Dec 2010 18:16:19 -0800
Subject: [PATCH] remove blank_search_panel since middle menu in all pages
 support search function now.

---
 ui/index.jsp                     |  4 +--
 ui/scripts/cloud.core.cluster.js | 42 +-------------------------------
 ui/scripts/cloud.core.js         | 14 +++--------
 ui/scripts/cloud.core.network.js |  2 +-
 4 files changed, 7 insertions(+), 55 deletions(-)

diff --git a/ui/index.jsp b/ui/index.jsp
index d871933cf7c..d96436102e7 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -166,9 +166,7 @@
                             <div id="advanced_search_container">
                             </div>
                         </div>
-                        
-                        <div class="searchpanel" id="blank_search_panel" style="display: none;">                            
-                        </div>
+                                                
                         <div id="midmenu_add_links_container">
 							<div class="actionpanel_button_wrapper" id="midmenu_add_link" style="display: none;">
 								<div class="actionpanel_button">
diff --git a/ui/scripts/cloud.core.cluster.js b/ui/scripts/cloud.core.cluster.js
index 5adc0708676..c75a5483be9 100644
--- a/ui/scripts/cloud.core.cluster.js
+++ b/ui/scripts/cloud.core.cluster.js
@@ -17,8 +17,6 @@
  */
   
 function afterLoadClusterJSP($leftmenuItem1) {
-    showMiddleMenuWithoutSearchAndPagination();    
-     
     clearAddButtonsOnTop(); 
     initAddHostButton($("#midmenu_add_host_button"), "cluster_page", $leftmenuItem1); 
     initAddPrimaryStorageButton($("#midmenu_add_primarystorage_button"), "cluster_page", $leftmenuItem1);  
@@ -30,45 +28,7 @@ function afterLoadClusterJSP($leftmenuItem1) {
 	clusterJsonToRightPanel($leftmenuItem1);	
 	
 	var clusterId = $leftmenuItem1.data("jsonObj").id;            
-    listMidMenuItems("hosts", ("listHosts&type=Routing&clusterid="+clusterId), hostGetSearchParams, "listhostsresponse", "host", "jsp/host.jsp", afterLoadHostJSP, hostToMidmenu, hostToRightPanel, getMidmenuId, false, ("cluster_"+clusterId));
-        
-    /*
-    var $midmenuContainer = $("#midmenu_container").empty();	
-            
-    var $container_host = $("<div id='midmenu_host_container'></div>"); 
-    $midmenuContainer.append($container_host);        
-    var $header1 = $("#midmenu_itemheader_without_margin").clone().show();  //without margin on top
-    $header1.find("#name").text("Host");
-    $container_host.append($header1);    
-    var count = 0;    
-    $.ajax({
-        cache: false,
-        data: createURL("command=listHosts&type=Routing&clusterid="+clusterId),
-        dataType: "json",
-        async: false,
-        success: function(json) { 
-            selectedItemsInMidMenu = {};    	                
-            var items = json.listhostsresponse.host;      
-            if(items != null && items.length > 0) {
-                for(var i=0; i<items.length;i++) { 
-                    var $midmenuItem1 = $("#midmenu_item").clone();                      
-                    $midmenuItem1.data("toRightPanelFn", hostToRightPanel);                             
-                    hostToMidmenu(items[i], $midmenuItem1);    
-                    bindClickToMidMenu($midmenuItem1, hostToRightPanel, hostGetMidmenuId);             
-                   
-                    $container_host.append($midmenuItem1.show());   
-                    if(i == 0)  { //click the 1st item in middle menu as default                        
-                        $midmenuItem1.click();   
-                    }                 
-                }  
-                count = items.length;
-            }  
-            else {
-                $container_host.append($("#midmenu_container_no_items_available").clone().attr("id","midmenu_container_no_items_available_clone").show());  
-            }                  
-        }
-    });	 	
-    */
+    listMidMenuItems("hosts", ("listHosts&type=Routing&clusterid="+clusterId), hostGetSearchParams, "listhostsresponse", "host", "jsp/host.jsp", afterLoadHostJSP, hostToMidmenu, hostToRightPanel, getMidmenuId, false, ("cluster_"+clusterId));    
 }
 
 function clusterJsonToRightPanel($leftmenuItem1) {
diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index d993fa9ae6d..d150c2d6d92 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -650,21 +650,15 @@ function selectLeftSubMenu($menuToSelect) {
 
 var selected_midmenu_id = null; 
 function hideMiddleMenu() {
-    $("#middle_menu, #search_panel, #blank_search_panel, #middle_menu_pagination").hide();
+    $("#middle_menu, #search_panel, #middle_menu_pagination").hide();
     $("#midmenu_container").empty();
     $("#right_panel").removeClass("main_contentarea_with_midmenu").addClass("main_contentarea_without_midmenu");            
 }
 function showMiddleMenu() {
-    $("#middle_menu, #search_panel, #middle_menu_pagination").show();
-    $("#blank_search_panel").hide();
+    $("#middle_menu, #search_panel, #middle_menu_pagination").show();   
     $("#right_panel").removeClass("main_contentarea_without_midmenu").addClass("main_contentarea_with_midmenu");
-}    
-function showMiddleMenuWithoutSearchAndPagination() {
-    $("#middle_menu").show();
-    $("#search_panel, #middle_menu_pagination").hide();
-    $("#blank_search_panel").show();
-    $("#right_panel").removeClass("main_contentarea_without_midmenu").addClass("main_contentarea_with_midmenu");
-}    
+} 
+
 function isMiddleMenuShown() {
     if($("#middle_menu").css("display") == "none")
         return false;
diff --git a/ui/scripts/cloud.core.network.js b/ui/scripts/cloud.core.network.js
index 8733911e88d..ed640173918 100644
--- a/ui/scripts/cloud.core.network.js
+++ b/ui/scripts/cloud.core.network.js
@@ -22,7 +22,7 @@ function afterLoadNetworkJSP($leftmenuItem1) {
     if(zoneObj == null) 
 	    return;	  
     
-    showMiddleMenuWithoutSearchAndPagination();    
+    showMiddleMenu();    
     
     initAddNetworkButton($("#midmenu_add_network_button"));