From 456b7a0ee0fdd90124d8ba979e10f1188f7e2bdb Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 26 Oct 2010 15:25:27 -0700
Subject: [PATCH] new UI - cluster page - middle menu - add middle menu item
 header "Host" above hosts, "Primary Storage" above primary storages.

---
 ui/new/index.jsp                       |  2 +-
 ui/new/scripts/cloud.core2.js          |  6 +++++-
 ui/new/scripts/cloud.core2.resource.js | 24 +++++++++++++++---------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/ui/new/index.jsp b/ui/new/index.jsp
index bee9823d813..75ce2bb58f2 100644
--- a/ui/new/index.jsp
+++ b/ui/new/index.jsp
@@ -678,7 +678,7 @@ long milliseconds = new Date().getTime();
         </div>
     </div>
     
-    <div class="midmenu_itemheader" style="display:none;"><p>(type)</p></div>    
+    <div id="midmenu_itemheader" class="midmenu_itemheader" style="display:none;"><p id="name"></p></div>    
     <div class="midmenu_list" id="midmenu_item" style="display: none;">
         <div class="midmenu_content" id="content">
             <div class="midmenu_icons" id="icon_container" style="display: none">
diff --git a/ui/new/scripts/cloud.core2.js b/ui/new/scripts/cloud.core2.js
index d4f9c642535..ff4ca743aa3 100644
--- a/ui/new/scripts/cloud.core2.js
+++ b/ui/new/scripts/cloud.core2.js
@@ -817,6 +817,7 @@ function listMidMenuItems2(commandString, jsonResponse1, jsonResponse2, toMidmen
     else
         disableMultipleSelectionInMidMenu();
     
+    var count = 0;    
     $.ajax({
         cache: false,
         data: createURL("command="+commandString+"&pagesize="+midmenuItemCount),
@@ -840,9 +841,12 @@ function listMidMenuItems2(commandString, jsonResponse1, jsonResponse2, toMidmen
                         }                        
                     }                 
                 }  
-            }  
+                count = items.length;
+            }             
         }
     });	 
+    
+    return count;
 }
 
 function listMidMenuItems(commandString, jsonResponse1, jsonResponse2, rightPanelJSP, afterLoadRightPanelJSPFn, toMidmenuFn, toRightPanelFn, getMidmenuIdFn, isMultipleSelectionInMidMenu) { 
diff --git a/ui/new/scripts/cloud.core2.resource.js b/ui/new/scripts/cloud.core2.resource.js
index 5b8c7f6467e..b24a72c8b3f 100644
--- a/ui/new/scripts/cloud.core2.resource.js
+++ b/ui/new/scripts/cloud.core2.resource.js
@@ -270,12 +270,7 @@ function showPage2($pageToShow, $menuItem1) {
 		    $("#dialog_add_pool").find("#add_pool_protocol").empty().html('<option value="nfs">NFS</option>');	
 	    bindEventHandlerToDialogAddPool();	 
 	    	    
-		podJsonToRightPanel($menuItem1);     
-		
-		//var podId = jsonObj.id;
-	    //$("#midmenu_container").empty();
-	    //listMidMenuItems2(("listHosts&type=Routing&podid="+podId), "listhostsresponse", "host", hostToMidmenu, hostToRightPanel, hostGetMidmenuId, false, false); 					
-		//listMidMenuItems2(("listStoragePools&podid="+podId), "liststoragepoolsresponse", "storagepool", primarystorageToMidmenu, primarystorageToRightPanel, primarystorageGetMidmenuId, false, false); 	
+		podJsonToRightPanel($menuItem1);     		
     }  
     else if($pageToShow.attr("id") == "cluster_page") {
         clearMiddleMenu(); 
@@ -288,9 +283,20 @@ function showPage2($pageToShow, $menuItem1) {
 		clusterJsonToRightPanel($menuItem1);
 		
 	    var clusterId = jsonObj.id;
-	    $("#midmenu_container").empty();
-	    listMidMenuItems2(("listHosts&type=Routing&clusterid="+clusterId), "listhostsresponse", "host", hostToMidmenu, hostToRightPanel, hostGetMidmenuId, false, true); 					
-		listMidMenuItems2(("listStoragePools&clusterid="+clusterId), "liststoragepoolsresponse", "storagepool", primarystorageToMidmenu, primarystorageToRightPanel, primarystorageGetMidmenuId, false, false); 			
+	    var $midmenuContainer = $("#midmenu_container").empty();	    
+	    var $header1 = $("#midmenu_itemheader").clone();
+	    $header1.find("#name").text("Host");
+	    $midmenuContainer.append($header1);
+	    var count1 = listMidMenuItems2(("listHosts&type=Routing&clusterid="+clusterId), "listhostsresponse", "host", hostToMidmenu, hostToRightPanel, hostGetMidmenuId, false, true); 					
+	    if(count1 > 0)
+		    $header1.show();
+		    
+		var $header2 = $("#midmenu_itemheader").clone();
+	    $header2.find("#name").text("Primary Storage");
+	    $midmenuContainer.append($header2);
+		var count2 = listMidMenuItems2(("listStoragePools&clusterid="+clusterId), "liststoragepoolsresponse", "storagepool", primarystorageToMidmenu, primarystorageToRightPanel, primarystorageGetMidmenuId, false, false); 			
+        if(count2 > 0)
+		    $header2.show();
     }
     else if($pageToShow.attr("id") == "host_page") {
         initAddHostButton($("#midmenu_add_link"));