From 03098ec8905cc04e934c5686255fd74ff6763764 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Wed, 27 Oct 2010 12:06:00 -0700 Subject: [PATCH] new UI - rename function name to be more intuitive. This function will handle all action info and copy them over to right panel when middle menu item is clicked. --- ui/new/scripts/cloud.core2.account.js | 2 +- ui/new/scripts/cloud.core2.alert.js | 2 +- ui/new/scripts/cloud.core2.diskoffering.js | 2 +- ui/new/scripts/cloud.core2.event.js | 2 +- ui/new/scripts/cloud.core2.globalsetting.js | 2 +- ui/new/scripts/cloud.core2.instance.js | 2 +- ui/new/scripts/cloud.core2.ipaddress.js | 2 +- ui/new/scripts/cloud.core2.iso.js | 2 +- ui/new/scripts/cloud.core2.js | 2 +- ui/new/scripts/cloud.core2.resource.js | 4 ++-- ui/new/scripts/cloud.core2.router.js | 2 +- ui/new/scripts/cloud.core2.serviceoffering.js | 2 +- ui/new/scripts/cloud.core2.snapshot.js | 2 +- ui/new/scripts/cloud.core2.template.js | 2 +- ui/new/scripts/cloud.core2.volume.js | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ui/new/scripts/cloud.core2.account.js b/ui/new/scripts/cloud.core2.account.js index 75f8bab9a15..648fdf75d71 100644 --- a/ui/new/scripts/cloud.core2.account.js +++ b/ui/new/scripts/cloud.core2.account.js @@ -43,7 +43,7 @@ function accountToMidmenu(jsonObj, $midmenuItem1) { } function accountToRightPanel($midmenuItem1) { - copyAfterActionInfoToRightPanel($midmenuItem1); + copyActionInfoFromMidMenuToRightPanel($midmenuItem1); accountJsonToDetailsTab($midmenuItem1); } diff --git a/ui/new/scripts/cloud.core2.alert.js b/ui/new/scripts/cloud.core2.alert.js index 505deeff1fe..1f20131713d 100644 --- a/ui/new/scripts/cloud.core2.alert.js +++ b/ui/new/scripts/cloud.core2.alert.js @@ -32,7 +32,7 @@ function alertToMidmenu(jsonObj, $midmenuItem1) { } function alertToRightPanel($midmenuItem1) { - copyAfterActionInfoToRightPanel($midmenuItem1); + copyActionInfoFromMidMenuToRightPanel($midmenuItem1); alertJsonToDetailsTab($midmenuItem1); } diff --git a/ui/new/scripts/cloud.core2.diskoffering.js b/ui/new/scripts/cloud.core2.diskoffering.js index 30def861406..8a19eba91a5 100644 --- a/ui/new/scripts/cloud.core2.diskoffering.js +++ b/ui/new/scripts/cloud.core2.diskoffering.js @@ -141,7 +141,7 @@ function diskOfferingToMidmenu(jsonObj, $midmenuItem1) { } function diskOfferingToRightPanel($midmenuItem1) { - copyAfterActionInfoToRightPanel($midmenuItem1); + copyActionInfoFromMidMenuToRightPanel($midmenuItem1); diskOfferingJsonToDetailsTab($midmenuItem1); } diff --git a/ui/new/scripts/cloud.core2.event.js b/ui/new/scripts/cloud.core2.event.js index 353cdcbb42d..e4d44ba04ef 100644 --- a/ui/new/scripts/cloud.core2.event.js +++ b/ui/new/scripts/cloud.core2.event.js @@ -37,7 +37,7 @@ function eventToMidmenu(jsonObj, $midmenuItem1) { } function eventToRightPanel($midmenuItem1) { - copyAfterActionInfoToRightPanel($midmenuItem1); + copyActionInfoFromMidMenuToRightPanel($midmenuItem1); eventJsonToDetailsTab($midmenuItem1); } diff --git a/ui/new/scripts/cloud.core2.globalsetting.js b/ui/new/scripts/cloud.core2.globalsetting.js index 2c0800b770b..215e5636daa 100644 --- a/ui/new/scripts/cloud.core2.globalsetting.js +++ b/ui/new/scripts/cloud.core2.globalsetting.js @@ -82,7 +82,7 @@ function globalSettingToMidmenu(jsonObj, $midmenuItem1) { } function globalSettingToRightPanel($midmenuItem1) { - copyAfterActionInfoToRightPanel($midmenuItem1); + copyActionInfoFromMidMenuToRightPanel($midmenuItem1); globalSettingJsonToDetailsTab($midmenuItem1); } diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js index 8ea03d7823d..9219684a72e 100644 --- a/ui/new/scripts/cloud.core2.instance.js +++ b/ui/new/scripts/cloud.core2.instance.js @@ -1457,7 +1457,7 @@ function vmToRightPanel($midmenuItem1) { var vmName = getVmName(jsonObj.name, jsonObj.displayname); $("right_panel_header").find("#vm_name").text(vmName); - copyAfterActionInfoToRightPanel($midmenuItem1); + copyActionInfoFromMidMenuToRightPanel($midmenuItem1); vmJsonToDetailsTab($midmenuItem1); vmJsonToVolumeTab(jsonObj); diff --git a/ui/new/scripts/cloud.core2.ipaddress.js b/ui/new/scripts/cloud.core2.ipaddress.js index 9b4c24db5d4..65d908b3e69 100644 --- a/ui/new/scripts/cloud.core2.ipaddress.js +++ b/ui/new/scripts/cloud.core2.ipaddress.js @@ -212,7 +212,7 @@ function isIpManageable(domainid, account) { function ipToRightPanel($midmenuItem1) { var ipObj = $midmenuItem1.data("jsonObj"); - copyAfterActionInfoToRightPanel($midmenuItem1); + copyActionInfoFromMidMenuToRightPanel($midmenuItem1); //Details tab ipJsonToDetailsTab($midmenuItem1); diff --git a/ui/new/scripts/cloud.core2.iso.js b/ui/new/scripts/cloud.core2.iso.js index 45eeea4b5db..800306c521f 100644 --- a/ui/new/scripts/cloud.core2.iso.js +++ b/ui/new/scripts/cloud.core2.iso.js @@ -170,7 +170,7 @@ function isoToMidmenu(jsonObj, $midmenuItem1) { } function isoToRightPanel($midmenuItem1) { - copyAfterActionInfoToRightPanel($midmenuItem1); + copyActionInfoFromMidMenuToRightPanel($midmenuItem1); isoJsonToDetailsTab($midmenuItem1); } diff --git a/ui/new/scripts/cloud.core2.js b/ui/new/scripts/cloud.core2.js index 409b7a912a9..87e789a7cec 100644 --- a/ui/new/scripts/cloud.core2.js +++ b/ui/new/scripts/cloud.core2.js @@ -492,7 +492,7 @@ function removeHighlightInMiddleMenu(selectedItemsInMidMenu) { } } -function copyAfterActionInfoToRightPanel($midmenuItem1) { +function copyActionInfoFromMidMenuToRightPanel($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")); diff --git a/ui/new/scripts/cloud.core2.resource.js b/ui/new/scripts/cloud.core2.resource.js index 1068d58a8b1..b447cf1b165 100644 --- a/ui/new/scripts/cloud.core2.resource.js +++ b/ui/new/scripts/cloud.core2.resource.js @@ -639,7 +639,7 @@ function hostToMidmenu(jsonObj, $midmenuItem1) { } function hostToRightPanel($midmenuItem1) { - copyAfterActionInfoToRightPanel($midmenuItem1); + copyActionInfoFromMidMenuToRightPanel($midmenuItem1); hostJsonToDetailsTab($midmenuItem1); showPage($("#host_page"), $midmenuItem1); } @@ -775,7 +775,7 @@ function primarystorageToMidmenu(jsonObj, $midmenuItem1) { } function primarystorageToRightPanel($midmenuItem1) { - copyAfterActionInfoToRightPanel($midmenuItem1); + copyActionInfoFromMidMenuToRightPanel($midmenuItem1); primarystorageJsonToDetailsTab($midmenuItem1); showPage($("#primarystorage_page"), $midmenuItem1); } diff --git a/ui/new/scripts/cloud.core2.router.js b/ui/new/scripts/cloud.core2.router.js index 9f1f6c4d15d..466ea2cf2b0 100644 --- a/ui/new/scripts/cloud.core2.router.js +++ b/ui/new/scripts/cloud.core2.router.js @@ -36,7 +36,7 @@ function routerAfterDetailsTabAction(json, $midmenuItem1, id) { } function routerToRightPanel($midmenuItem1) { - copyAfterActionInfoToRightPanel($midmenuItem1); + copyActionInfoFromMidMenuToRightPanel($midmenuItem1); routerJsonToDetailsTab($midmenuItem1); } diff --git a/ui/new/scripts/cloud.core2.serviceoffering.js b/ui/new/scripts/cloud.core2.serviceoffering.js index 6143e03db97..ba14451e5eb 100644 --- a/ui/new/scripts/cloud.core2.serviceoffering.js +++ b/ui/new/scripts/cloud.core2.serviceoffering.js @@ -158,7 +158,7 @@ function serviceOfferingToMidmenu(jsonObj, $midmenuItem1) { } function serviceOfferingToRightPanel($midmenuItem1) { - copyAfterActionInfoToRightPanel($midmenuItem1); + copyActionInfoFromMidMenuToRightPanel($midmenuItem1); serviceOfferingJsonToDetailsTab($midmenuItem1); } diff --git a/ui/new/scripts/cloud.core2.snapshot.js b/ui/new/scripts/cloud.core2.snapshot.js index 265641b1c28..2fcadbbc1e8 100644 --- a/ui/new/scripts/cloud.core2.snapshot.js +++ b/ui/new/scripts/cloud.core2.snapshot.js @@ -59,7 +59,7 @@ function snapshotToMidmenu(jsonObj, $midmenuItem1) { } function snapshotToRightPanel($midmenuItem1) { - copyAfterActionInfoToRightPanel($midmenuItem1); + copyActionInfoFromMidMenuToRightPanel($midmenuItem1); snapshotJsonToDetailsTab($midmenuItem1); } diff --git a/ui/new/scripts/cloud.core2.template.js b/ui/new/scripts/cloud.core2.template.js index fcad5a4d4ac..60b5ab4dd9e 100644 --- a/ui/new/scripts/cloud.core2.template.js +++ b/ui/new/scripts/cloud.core2.template.js @@ -226,7 +226,7 @@ function templateToMidmenu(jsonObj, $midmenuItem1) { } function templateToRightPanel($midmenuItem1) { - copyAfterActionInfoToRightPanel($midmenuItem1); + copyActionInfoFromMidMenuToRightPanel($midmenuItem1); templateJsonToDetailsTab($midmenuItem1); } diff --git a/ui/new/scripts/cloud.core2.volume.js b/ui/new/scripts/cloud.core2.volume.js index 9b4368d81c5..0d38798d771 100644 --- a/ui/new/scripts/cloud.core2.volume.js +++ b/ui/new/scripts/cloud.core2.volume.js @@ -401,7 +401,7 @@ function volumeToMidmenu(jsonObj, $midmenuItem1) { } function volumeToRightPanel($midmenuItem1) { - copyAfterActionInfoToRightPanel($midmenuItem1); + copyActionInfoFromMidMenuToRightPanel($midmenuItem1); volumeJsonToDetailsTab($midmenuItem1); var jsonObj = $midmenuItem1.data("jsonObj");