diff --git a/ui/new/scripts/cloud.core2.alert.js b/ui/new/scripts/cloud.core2.alert.js index d2296de4fd2..910df9fc1d5 100644 --- a/ui/new/scripts/cloud.core2.alert.js +++ b/ui/new/scripts/cloud.core2.alert.js @@ -27,7 +27,7 @@ function alertToMidmenu(jsonObj, $midmenuItem1) { $midmenuItem1.find("#second_row").text(jsonObj.type.substring(0,25)); } -function alertToRigntPanel($midmenuItem1) { +function alertToRightPanel($midmenuItem1) { alertJsonToDetailsTab($midmenuItem1); } diff --git a/ui/new/scripts/cloud.core2.diskoffering.js b/ui/new/scripts/cloud.core2.diskoffering.js index 8ff2eb8a34b..b4046a17f06 100644 --- a/ui/new/scripts/cloud.core2.diskoffering.js +++ b/ui/new/scripts/cloud.core2.diskoffering.js @@ -74,7 +74,7 @@ function afterLoadDiskOfferingJSP() { success: function(json) { var item = json.creatediskofferingresponse; diskOfferingToMidmenu(item, $midmenuItem1); - bindClickToMidMenu($midmenuItem1, diskOfferingToRigntPanel, getMidmenuId); + bindClickToMidMenu($midmenuItem1, diskOfferingToRightPanel, getMidmenuId); afterAddingMidMenuItem($midmenuItem1, true); }, error: function(XMLHttpResponse) { @@ -124,7 +124,7 @@ function doUpdateDiskOffering() { }); var $midmenuItem1 = $("#"+getMidmenuId(jsonObj)); diskOfferingToMidmenu(jsonObj, $midmenuItem1); - diskOfferingToRigntPanel($midmenuItem1); + diskOfferingToRightPanel($midmenuItem1); } }); } @@ -140,7 +140,7 @@ function diskOfferingToMidmenu(jsonObj, $midmenuItem1) { $midmenuItem1.find("#second_row").text(convertBytes(jsonObj.disksize)); } -function diskOfferingToRigntPanel($midmenuItem1) { +function diskOfferingToRightPanel($midmenuItem1) { diskOfferingJsonToDetailsTab($midmenuItem1); } diff --git a/ui/new/scripts/cloud.core2.event.js b/ui/new/scripts/cloud.core2.event.js index 911a13b5ab7..aa1d5e6b67e 100644 --- a/ui/new/scripts/cloud.core2.event.js +++ b/ui/new/scripts/cloud.core2.event.js @@ -36,7 +36,7 @@ function eventToMidmenu(jsonObj, $midmenuItem1) { $midmenuItem1.find("#second_row").text(jsonObj.type.substring(0,25)); } -function eventToRigntPanel($midmenuItem1) { +function eventToRightPanel($midmenuItem1) { eventJsonToDetailsTab($midmenuItem1); } diff --git a/ui/new/scripts/cloud.core2.globalsetting.js b/ui/new/scripts/cloud.core2.globalsetting.js index 6a821efa4e8..15119b816d4 100644 --- a/ui/new/scripts/cloud.core2.globalsetting.js +++ b/ui/new/scripts/cloud.core2.globalsetting.js @@ -57,7 +57,7 @@ function doUpdateGlobalSetting() { }); var $midmenuItem1 = $("#"+globalSettingGetMidmenuId(jsonObj)); globalSettingToMidmenu(jsonObj, $midmenuItem1); - globalSettingToRigntPanel($midmenuItem1); + globalSettingToRightPanel($midmenuItem1); $("#dialog_alert_restart_management_server").dialog("open"); } @@ -81,7 +81,7 @@ function globalSettingToMidmenu(jsonObj, $midmenuItem1) { $midmenuItem1.find("#second_row").text(fromdb(jsonObj.value).substring(0,25)); } -function globalSettingToRigntPanel($midmenuItem1) { +function globalSettingToRightPanel($midmenuItem1) { globalSettingJsonToDetailsTab($midmenuItem1); } diff --git a/ui/new/scripts/cloud.core2.init.js b/ui/new/scripts/cloud.core2.init.js index 1a634a72aef..b0e6634c457 100644 --- a/ui/new/scripts/cloud.core2.init.js +++ b/ui/new/scripts/cloud.core2.init.js @@ -65,24 +65,24 @@ $(document).ready(function() { // Setup 2nd level navigation - bindAndListMidMenuItems($("#leftmenu_event"), "listEvents", "listeventsresponse", "event", "jsp/event.jsp", afterLoadEventJSP, eventToMidmenu, eventToRigntPanel, getMidmenuId, false); - bindAndListMidMenuItems($("#leftmenu_alert"), "listAlerts", "listalertsresponse", "alert", "jsp/alert.jsp", afterLoadAlertJSP, alertToMidmenu, alertToRigntPanel, getMidmenuId, false); - bindAndListMidMenuItems($("#leftmenu_volume"), "listVolumes", "listvolumesresponse", "volume", "jsp/volume.jsp", afterLoadVolumeJSP, volumeToMidmenu, volumeToRigntPanel, getMidmenuId, false); - bindAndListMidMenuItems($("#leftmenu_snapshot"), "listSnapshots", "listsnapshotsresponse", "snapshot", "jsp/snapshot.jsp", afterLoadSnapshotJSP, snapshotToMidmenu, snapshotToRigntPanel, getMidmenuId, false); - bindAndListMidMenuItems($("#leftmenu_ip"), "listPublicIpAddresses", "listpublicipaddressesresponse", "publicipaddress", "jsp/ipaddress.jsp", afterLoadIpJSP, ipToMidmenu, ipToRigntPanel, ipGetMidmenuId, false); + bindAndListMidMenuItems($("#leftmenu_event"), "listEvents", "listeventsresponse", "event", "jsp/event.jsp", afterLoadEventJSP, eventToMidmenu, eventToRightPanel, getMidmenuId, false); + bindAndListMidMenuItems($("#leftmenu_alert"), "listAlerts", "listalertsresponse", "alert", "jsp/alert.jsp", afterLoadAlertJSP, alertToMidmenu, alertToRightPanel, getMidmenuId, false); + bindAndListMidMenuItems($("#leftmenu_volume"), "listVolumes", "listvolumesresponse", "volume", "jsp/volume.jsp", afterLoadVolumeJSP, volumeToMidmenu, volumeToRightPanel, getMidmenuId, false); + bindAndListMidMenuItems($("#leftmenu_snapshot"), "listSnapshots", "listsnapshotsresponse", "snapshot", "jsp/snapshot.jsp", afterLoadSnapshotJSP, snapshotToMidmenu, snapshotToRightPanel, getMidmenuId, false); + bindAndListMidMenuItems($("#leftmenu_ip"), "listPublicIpAddresses", "listpublicipaddressesresponse", "publicipaddress", "jsp/ipaddress.jsp", afterLoadIpJSP, ipToMidmenu, ipToRightPanel, ipGetMidmenuId, false); //bindAndListMidMenuItems("leftmenu_router", "listRouters", "listroutersresponse", "router", "jsp/router.jsp", afterLoadRouterJSP, routerToMidmenu, routerToRightPanel, getMidmenuId, false); - bindAndListMidMenuItems($("#leftmenu_submenu_my_template"), "listTemplates&templatefilter=self", "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRigntPanel, templateGetMidmenuId, false); - bindAndListMidMenuItems($("#leftmenu_submenu_featured_template"), "listTemplates&templatefilter=featured", "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRigntPanel, templateGetMidmenuId, false); - bindAndListMidMenuItems($("#leftmenu_submenu_community_template"), "listTemplates&templatefilter=community", "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRigntPanel, templateGetMidmenuId, false); + bindAndListMidMenuItems($("#leftmenu_submenu_my_template"), "listTemplates&templatefilter=self", "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRightPanel, templateGetMidmenuId, false); + bindAndListMidMenuItems($("#leftmenu_submenu_featured_template"), "listTemplates&templatefilter=featured", "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRightPanel, templateGetMidmenuId, false); + bindAndListMidMenuItems($("#leftmenu_submenu_community_template"), "listTemplates&templatefilter=community", "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRightPanel, templateGetMidmenuId, false); bindAndListMidMenuItems($("#leftmenu_submenu_my_iso"), "listIsos&isofilter=self", "listisosresponse", "iso", "jsp/iso.jsp", afterLoadIsoJSP, isoToMidmenu, isoToRightPanel, isoGetMidmenuId, false); bindAndListMidMenuItems($("#leftmenu_submenu_featured_iso"), "listIsos&isofilter=featured", "listisosresponse", "iso", "jsp/iso.jsp", afterLoadIsoJSP, isoToMidmenu, isoToRightPanel, isoGetMidmenuId, false); bindAndListMidMenuItems($("#leftmenu_submenu_community_iso"), "listIsos&isofilter=community", "listisosresponse", "iso", "jsp/iso.jsp", afterLoadIsoJSP, isoToMidmenu, isoToRightPanel, isoGetMidmenuId, false); bindAndListMidMenuItems($("#leftmenu_service_offering"), "listServiceOfferings", "listserviceofferingsresponse", "serviceoffering", "jsp/serviceoffering.jsp", afterLoadServiceOfferingJSP, serviceOfferingToMidmenu, serviceOfferingToRightPanel, getMidmenuId, false); - bindAndListMidMenuItems($("#leftmenu_disk_offering"), "listDiskOfferings", "listdiskofferingsresponse", "diskoffering", "jsp/diskoffering.jsp", afterLoadDiskOfferingJSP, diskOfferingToMidmenu, diskOfferingToRigntPanel, getMidmenuId, false); - bindAndListMidMenuItems($("#leftmenu_global_setting"), "listConfigurations", "listconfigurationsresponse", "configuration", "jsp/globalsetting.jsp", afterLoadGlobalSettingJSP, globalSettingToMidmenu, globalSettingToRigntPanel, globalSettingGetMidmenuId, false); + bindAndListMidMenuItems($("#leftmenu_disk_offering"), "listDiskOfferings", "listdiskofferingsresponse", "diskoffering", "jsp/diskoffering.jsp", afterLoadDiskOfferingJSP, diskOfferingToMidmenu, diskOfferingToRightPanel, getMidmenuId, false); + bindAndListMidMenuItems($("#leftmenu_global_setting"), "listConfigurations", "listconfigurationsresponse", "configuration", "jsp/globalsetting.jsp", afterLoadGlobalSettingJSP, globalSettingToMidmenu, globalSettingToRightPanel, globalSettingGetMidmenuId, false); $("#leftmenu_instances").bind("click", function(event) { selectLeftMenu($(this), true); diff --git a/ui/new/scripts/cloud.core2.ipaddress.js b/ui/new/scripts/cloud.core2.ipaddress.js index 520e817ba10..a9ae2f454c7 100644 --- a/ui/new/scripts/cloud.core2.ipaddress.js +++ b/ui/new/scripts/cloud.core2.ipaddress.js @@ -62,7 +62,7 @@ function afterLoadIpJSP() { var item = json.associateipaddressresponse; //$("#dialog_info").html("
The IP address "+items[0].ipaddress+" has been assigned to your account
").dialog("open"); ipToMidmenu(item, $midmenuItem1); - bindClickToMidMenu($midmenuItem1, ipToRigntPanel, ipGetMidmenuId); + bindClickToMidMenu($midmenuItem1, ipToRightPanel, ipGetMidmenuId); afterAddingMidMenuItem($midmenuItem1, true); }, @@ -209,7 +209,7 @@ function isIpManageable(domainid, account) { return false; } -function ipToRigntPanel($midmenuItem1) { +function ipToRightPanel($midmenuItem1) { var ipObj = $midmenuItem1.data("jsonObj"); //Details tab diff --git a/ui/new/scripts/cloud.core2.snapshot.js b/ui/new/scripts/cloud.core2.snapshot.js index dde603d00cb..f17b1d730cd 100644 --- a/ui/new/scripts/cloud.core2.snapshot.js +++ b/ui/new/scripts/cloud.core2.snapshot.js @@ -58,7 +58,7 @@ function snapshotToMidmenu(jsonObj, $midmenuItem1) { $midmenuItem1.find("#second_row").text(fromdb(jsonObj.volumename).substring(0,25)); } -function snapshotToRigntPanel($midmenuItem1) { +function snapshotToRightPanel($midmenuItem1) { snapshotJsonToDetailsTab($midmenuItem1); } diff --git a/ui/new/scripts/cloud.core2.template.js b/ui/new/scripts/cloud.core2.template.js index f4af03afac1..58fc7db3628 100644 --- a/ui/new/scripts/cloud.core2.template.js +++ b/ui/new/scripts/cloud.core2.template.js @@ -93,14 +93,14 @@ function afterLoadTemplateJSP() { success: function(json) { var items = json.registertemplateresponse.template; templateToMidmenu(items[0], $midmenuItem1); - bindClickToMidMenu($midmenuItem1, templateToRigntPanel, templateGetMidmenuId); + bindClickToMidMenu($midmenuItem1, templateToRightPanel, templateGetMidmenuId); afterAddingMidMenuItem($midmenuItem1, true); if(items.length > 1) { for(var i=1; i