From 9224c8134b8ca637508c0bd1f4fa6f3ed3a4932e Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Sun, 24 Oct 2010 23:56:11 -0700 Subject: [PATCH] new UI - middle menu actions (multiple-selection base) - copy action info to right panel when middle menu is clicked. --- ui/new/scripts/cloud.core2.instance.js | 23 ++++------------------- ui/new/scripts/cloud.core2.js | 21 ++++++++++++++++++++- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js index a35fc229bd6..05b556dcae4 100644 --- a/ui/new/scripts/cloud.core2.instance.js +++ b/ui/new/scripts/cloud.core2.instance.js @@ -93,7 +93,7 @@ function afterLoadInstanceJSP() { afterActionSeccessFn: function(json, $midmenuItem1, id) { var jsonObj = json.queryasyncjobresultresponse.jobresult.startvirtualmachineresponse; vmToMidmenu(jsonObj, $midmenuItem1); - vmToRightPanel($midmenuItem1); + vmToRightPanel($midmenuItem1); } } doActionForMidMenu(id, apiInfo, apiCommand); @@ -1179,24 +1179,9 @@ function vmToRightPanel($midmenuItem1) { var vmName = getVmName(jsonObj.name, jsonObj.displayname); $("right_panel_header").find("#vm_name").text(vmName); - - //Comment the following code which is for middle menu action, not details tab action. - /* - var $rightPanelContent = $("#right_panel_content"); - if($midmenuItem1.find("#info_icon").css("display") != "none") { - $rightPanelContent.find("#after_action_info").text($midmenuItem1.data("afterActionInfo")); - if($midmenuItem1.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(); - } - */ - + + copyAfterActionInfoToRightPanel($midmenuItem1); + vmJsonToDetailsTab($midmenuItem1); vmJsonToVolumeTab(jsonObj); diff --git a/ui/new/scripts/cloud.core2.js b/ui/new/scripts/cloud.core2.js index b6bda6a682e..ebb49c23eac 100644 --- a/ui/new/scripts/cloud.core2.js +++ b/ui/new/scripts/cloud.core2.js @@ -446,7 +446,26 @@ function removeHighlightInMiddleMenu(selectedItemsInMidMenu) { var $midmenuItem1 = $("#midmenuItem_"+id); $midmenuItem1.find("#content").removeClass("selected"); } -} +} + +function copyAfterActionInfoToRightPanel($midmenuItem1) { + var $afterActionInfoContainer = $("#right_panel_content #after_action_info_container_on_top"); + if($midmenuItem1.find("#info_icon").css("display") != "none") { + $afterActionInfoContainer.find("#after_action_info").text($midmenuItem1.data("afterActionInfo")); + if($midmenuItem1.find("#info_icon").hasClass("error")) + $afterActionInfoContainer.addClass("errorbox"); + else + $afterActionInfoContainer.removeClass("errorbox"); + $afterActionInfoContainer.show(); + } + /* + else { + $afterActionInfoContainer.find("#after_action_info").text(""); + $afterActionInfoContainer.hide(); + } + */ +} + //***** actions for middle menu (end) **************************************************************************