From ab05973b18372c4422fa3a77dd178d2dc7e998ef Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 13 Sep 2010 11:05:42 -0700
Subject: [PATCH] new UI - clear midmenu icons (add icon, action icon) when
 clicking on a different page.

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

diff --git a/ui/new/index.jsp b/ui/new/index.jsp
index a60dc348803..5d6c90e1bec 100644
--- a/ui/new/index.jsp
+++ b/ui/new/index.jsp
@@ -105,7 +105,7 @@ long milliseconds = new Date().getTime();
                                 </ul>
                             </div>
                         </div>
-                        <div class="actionpanel_button_wrapper" id="add_link" style="display: none">
+                        <div class="actionpanel_button_wrapper" id="midmenu_add_link" style="display: none">
                             <div class="actionpanel_button">
                                 <div class="actionpanel_button_icons">
                                     <img src="images/addvm_actionicon.png" alt="Add" /></div>
diff --git a/ui/new/scripts/cloud.core2.init.js b/ui/new/scripts/cloud.core2.init.js
index e514cf6d95f..237c53aca6a 100644
--- a/ui/new/scripts/cloud.core2.init.js
+++ b/ui/new/scripts/cloud.core2.init.js
@@ -50,9 +50,15 @@ $(document).ready(function() {
         $midmenuItem1.data("toRightPanelFn", toRightPanelFn);
     }
     
+    function clearMidMenu() {
+        $("#midmenu_action_link").hide();
+        $("#midmenu_add_link").hide();
+    }
+    
     var $midmenuItem = $("#midmenu_item");
     function listMidMenuItems(leftmenuId, apiName, jsonResponse1, jsonResponse2, rightPanelJSP, afterLoadRightPanelJSP, toMidmenu, toRightPanel) { 
         $("#"+leftmenuId).bind("click", function(event) {
+            clearMidMenu();
             $("#right_panel").load(rightPanelJSP, function(){   
                 afterLoadRightPanelJSP();
                 $.ajax({
@@ -84,7 +90,8 @@ $(document).ready(function() {
     listMidMenuItems("leftmenu_snapshot", "listSnapshots", "listsnapshotsresponse", "snapshot", "jsp/snapshot.jsp", afterLoadSnapshotJSP, snapshotToMidmenu, snapshotToRigntPanel);
     listMidMenuItems("leftmenu_ip", "listPublicIpAddresses", "listpublicipaddressesresponse", "publicipaddress", "jsp/ip_address.jsp", afterLoadIpJSP, ipToMidmenu, ipToRigntPanel);
     
-    $("#leftmenu_instance_group_header").bind("click", function(event) {   
+    $("#leftmenu_instance_group_header").bind("click", function(event) {  
+        clearMidMenu(); 
         var $arrowIcon = $(this).find("#arrow_icon");        
         clickInstanceGroupHeader($arrowIcon);
         return false;
diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js
index 14cd0efd66b..8b2e146e6fe 100644
--- a/ui/new/scripts/cloud.core2.instance.js
+++ b/ui/new/scripts/cloud.core2.instance.js
@@ -484,7 +484,7 @@ function clickInstanceGroupHeader($arrowIcon) {
     //***** declaration for volume tab (end) *********************************************************
     
        
-    $("#add_link").show(); 
+    $("#midmenu_add_link").show(); 
 	if($arrowIcon.hasClass("close") == true) {
         $arrowIcon.removeClass("close").addClass("open");    
         $.ajax({
@@ -629,7 +629,7 @@ function clickInstanceGroupHeader($arrowIcon) {
         var currentPageInTemplateGridInVmPopup =1;
 	    var selectedTemplateTypeInVmPopup;  //selectedTemplateTypeInVmPopup will be set to "featured" when new VM dialog box opens
     	   	
-	    $("#add_link").unbind("click").bind("click", function(event) {
+	    $("#midmenu_add_link").unbind("click").bind("click", function(event) {
             vmWizardOpen();			
 		    $.ajax({
 			    data: createURL("command=listZones&available=true"),