From a5430ffd5f62cc7f6cbe67d1c5ad1b81df774f9b Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 16 Sep 2010 17:17:29 -0700
Subject: [PATCH] new UI - hide middle menu navigation when dashboard page is
 loaded.

---
 ui/new/index.jsp                       |  2 +-
 ui/new/scripts/cloud.core2.instance.js | 56 ++++++++++++++------------
 ui/new/scripts/cloud.core2.js          |  4 +-
 3 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/ui/new/index.jsp b/ui/new/index.jsp
index 0afb8418fbe..1236ea08e02 100644
--- a/ui/new/index.jsp
+++ b/ui/new/index.jsp
@@ -252,7 +252,7 @@ long milliseconds = new Date().getTime();
                         </div>
                         -->
                     </div>
-                    <div class="midmenu_navigationbox">
+                    <div class="midmenu_navigationbox" id="middle_menu_pagination">
                         <div class="midmenu_prevbutton">
                         </div>
                         <div class="midmenu_nextbutton">
diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js
index 7d1ce21df9e..1ceedf983d6 100644
--- a/ui/new/scripts/cloud.core2.instance.js
+++ b/ui/new/scripts/cloud.core2.instance.js
@@ -377,31 +377,33 @@ function clickInstanceGroupHeader($arrowIcon) {
     }
     
     function vmToRightPanel($midmenuItem) {
-        var json = $midmenuItem.data("jsonObj");  
-        vmJsonToDetailsTab(json, $midmenuItem);   
+        var jsonObj = $midmenuItem.data("jsonObj");          
+        
+        var vmName = getVmName(jsonObj.name, jsonObj.displayname);        
+        $("right_panel_header").find("#vm_name").text(fromdb(vmName));	
+        
+        var $rightPanelContent = $("#right_panel_content");        
+        if($midmenuItem.find("#info_icon").css("display") != "none") {                
+            $rightPanelContent.find("#after_action_info").text($midmenuItem.data("afterActionInfo"));
+            if($midmenuItem.find("#info_icon").hasClass("error"))
+                $rightPanelContent.find("#after_action_info_container").addClass("errorbox");
+             else
+                $rightPanelContent.find("#after_action_info_container").removeClass("errorbox");                                        
+            $rightPanelContent.find("#after_action_info_container").show();                                         
+        } 
+        else {
+            $rightPanelContent.find("#after_action_info").text("");
+            $rightPanelContent.find("#after_action_info_container").hide();                
+        }
+        
+        vmJsonToDetailsTab(jsonObj, $midmenuItem);   
     }
      
     function vmJsonToDetailsTab(jsonObj, $midmenuItem){
         var $detailsTab = $("#right_panel_content #tab_content_details");  
         $detailsTab.data("jsonObj", jsonObj);  
     
-        //details tab 
-        if($midmenuItem.find("#info_icon").css("display") != "none") {                
-            $detailsTab.find("#after_action_info").text($midmenuItem.data("afterActionInfo"));
-            if($midmenuItem.find("#info_icon").hasClass("error"))
-                $detailsTab.find("#after_action_info_container").addClass("errorbox");
-             else
-                $detailsTab.find("#after_action_info_container").removeClass("errorbox");                                        
-            $detailsTab.find("#after_action_info_container").show();                                         
-        } 
-        else {
-            $detailsTab.find("#after_action_info").text("");
-            $detailsTab.find("#after_action_info_container").hide();                
-        }
-        
-          
-        var vmName = getVmName(jsonObj.name, jsonObj.displayname);        
-        $rightPanelHeader.find("#vm_name").text(fromdb(vmName));	
+        //details tab         
         updateVirtualMachineStateInRightPanel(jsonObj.state);	
         $detailsTab.find("#ipAddress").text(jsonObj.ipaddress);
         $detailsTab.find("#zoneName").text(fromdb(jsonObj.zonename));
@@ -569,13 +571,15 @@ function clickInstanceGroupHeader($arrowIcon) {
 	                            data: createURL("command=listVirtualMachines&group="+group1+"&pagesize="+midmenuItemCount),
 	                            dataType: "json",
 	                            success: function(json) {		                                                             
-	                                var instances = json.listvirtualmachinesresponse.virtualmachine;                               
-                                    for(var i=0; i<instances.length;i++) {  
-                                        var $midmenuItem1 = $midmenuItem.clone();
-                                        $midmenuItem1.data("toRightPanelFn", vmToRightPanel);                                                                                                                               
-                                        vmToMidmenu(instances[i], $midmenuItem1);  
-                                        $("#midmenu_container").append($midmenuItem1.show());
-                                    }    
+	                                var instances = json.listvirtualmachinesresponse.virtualmachine;    
+	                                if (instances != null && instances.length > 0) {	                           
+                                        for(var i=0; i<instances.length;i++) {  
+                                            var $midmenuItem1 = $midmenuItem.clone();
+                                            $midmenuItem1.data("toRightPanelFn", vmToRightPanel);                                                                                                                               
+                                            vmToMidmenu(instances[i], $midmenuItem1);  
+                                            $("#midmenu_container").append($midmenuItem1.show());
+                                        }  
+                                    }  
 	                            }
 	                        });                            
                             return false;
diff --git a/ui/new/scripts/cloud.core2.js b/ui/new/scripts/cloud.core2.js
index 6a36d47e97a..e105eba3c66 100644
--- a/ui/new/scripts/cloud.core2.js
+++ b/ui/new/scripts/cloud.core2.js
@@ -545,12 +545,12 @@ var selected_leftmenu_id = null;
 var selected_midmenu_id = null;
  
 function hideMiddleMenu() {
-    $("#middle_menu, #search_panel").hide();
+    $("#middle_menu, #search_panel, #middle_menu_pagination").hide();
     $("#right_panel").removeClass("main_contentarea").addClass("main_contentarea_dashboard");
 }
 
 function showMiddleMenu() {
-    $("#middle_menu, #search_panel").show();
+    $("#middle_menu, #search_panel, #middle_menu_pagination").show();
     $("#right_panel").removeClass("main_contentarea_dashboard").addClass("main_contentarea");
 }