From 04065255b1b062ebf21db514e56865cfab5ca9a3 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Sun, 12 Sep 2010 21:01:46 -0700
Subject: [PATCH] new UI - fix a bug - clicking IP address on left menu didn't
 work.

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

diff --git a/ui/new/index.jsp b/ui/new/index.jsp
index 425edbeaab9..a60dc348803 100644
--- a/ui/new/index.jsp
+++ b/ui/new/index.jsp
@@ -90,7 +90,7 @@ long milliseconds = new Date().getTime();
                             </form>
                             <a href="#">Advanced</a>
                         </div>
-                        <div class="actionpanel_button_wrapper" id="action_link" style="position: relative;
+                        <div class="actionpanel_button_wrapper" id="midmenu_action_link" style="position: relative;
                             display: none">
                             <div class="actionpanel_button">
                                 <div class="actionpanel_button_icons">
diff --git a/ui/new/scripts/cloud.core2.init.js b/ui/new/scripts/cloud.core2.init.js
index eca3254d4e1..e514cf6d95f 100644
--- a/ui/new/scripts/cloud.core2.init.js
+++ b/ui/new/scripts/cloud.core2.init.js
@@ -40,13 +40,6 @@ $(document).ready(function() {
             }             
         }
     });
- 
-    $("#leftmenu_instance_group_header").bind("click", function(event) {   
-        var $arrowIcon = $(this).find("#arrow_icon");        
-        clickInstanceGroupHeader($arrowIcon);
-        return false;
-    });
-    
     
     function jsonToMidmenu(jsonObj, $midmenuItem1, propertyForFirstRow, propertyForSecondRow, toRightPanelFn) {  
         $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id));                             
@@ -89,14 +82,23 @@ $(document).ready(function() {
     listMidMenuItems("leftmenu_account", "listAccounts", "listaccountsresponse", "account", "jsp/account.jsp", afterLoadAccountJSP, accountToMidmenu, accountToRigntPanel);
     listMidMenuItems("leftmenu_volume", "listVolumes", "listvolumesresponse", "volume", "jsp/volume.jsp", afterLoadVolumeJSP, volumeToMidmenu, volumeToRigntPanel);
     listMidMenuItems("leftmenu_snapshot", "listSnapshots", "listsnapshotsresponse", "snapshot", "jsp/snapshot.jsp", afterLoadSnapshotJSP, snapshotToMidmenu, snapshotToRigntPanel);
-    listMidMenuItems("leftmenu_ip", "listPublicIpAddresses", "listpublicipaddressesresponse", "publicipaddress", afterLoadIpJSP, "jsp/ip_address.jsp", ipToMidmenu, ipToRigntPanel);
+    listMidMenuItems("leftmenu_ip", "listPublicIpAddresses", "listpublicipaddressesresponse", "publicipaddress", "jsp/ip_address.jsp", afterLoadIpJSP, ipToMidmenu, ipToRigntPanel);
     
-       
-    $("#action_link").bind("mouseover", function(event) {
+    $("#leftmenu_instance_group_header").bind("click", function(event) {   
+        var $arrowIcon = $(this).find("#arrow_icon");        
+        clickInstanceGroupHeader($arrowIcon);
+        return false;
+    });
+    
+    
+    
+    
+           
+    $("#midmenu_action_link").bind("mouseover", function(event) {
         $(this).find("#action_menu").show();    
         return false;
     });
-    $("#action_link").bind("mouseout", function(event) {
+    $("#midmenu_action_link").bind("mouseout", function(event) {
         $(this).find("#action_menu").hide();    
         return false;
     });
diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js
index 42b64c17f85..14cd0efd66b 100644
--- a/ui/new/scripts/cloud.core2.instance.js
+++ b/ui/new/scripts/cloud.core2.instance.js
@@ -544,7 +544,7 @@ function clickInstanceGroupHeader($arrowIcon) {
 		        }
 		        
 		        //action menu			        
-		        $("#action_link").show();
+		        $("#midmenu_action_link").show();
 		        $("#action_menu #action_list").empty();		        
 		        for(var label in vmActionMap) 				            
 		            buildActionLinkForMidMenu(label, vmActionMap, $("#action_menu"), vmListAPIMap);