diff --git a/ui/new/jsp/instance.jsp b/ui/new/jsp/instance.jsp index 18163f88c36..b8456bcc2f9 100644 --- a/ui/new/jsp/instance.jsp +++ b/ui/new/jsp/instance.jsp @@ -870,24 +870,4 @@ - - -
\ No newline at end of file diff --git a/ui/new/jsp/volume.jsp b/ui/new/jsp/volume.jsp index dc30712f739..729bb5779b0 100644 --- a/ui/new/jsp/volume.jsp +++ b/ui/new/jsp/volume.jsp @@ -165,5 +165,54 @@ + - \ No newline at end of file + + \ No newline at end of file diff --git a/ui/new/scripts/cloud.core2.account.js b/ui/new/scripts/cloud.core2.account.js index ec9044531c5..1b5db3800a8 100644 --- a/ui/new/scripts/cloud.core2.account.js +++ b/ui/new/scripts/cloud.core2.account.js @@ -1,3 +1,7 @@ +function afterLoadAccountJSP() { + +} + function accountToMidmenu(jsonObj, $midmenuItem1, toRightPanelFn) { $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id)); $midmenuItem1.data("id", jsonObj.id); diff --git a/ui/new/scripts/cloud.core2.alert.js b/ui/new/scripts/cloud.core2.alert.js index 04ede572047..46e2d5756c6 100644 --- a/ui/new/scripts/cloud.core2.alert.js +++ b/ui/new/scripts/cloud.core2.alert.js @@ -1,3 +1,7 @@ +function afterLoadAlertJSP() { + +} + function alertToMidmenu(jsonObj, $midmenuItem1, toRightPanelFn) { $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id)); $midmenuItem1.data("id", jsonObj.id); diff --git a/ui/new/scripts/cloud.core2.event.js b/ui/new/scripts/cloud.core2.event.js index d5bac6ebabf..b3d86a66e0e 100644 --- a/ui/new/scripts/cloud.core2.event.js +++ b/ui/new/scripts/cloud.core2.event.js @@ -1,3 +1,7 @@ +function afterLoadEventJSP() { + +} + function eventToMidmenu(jsonObj, $midmenuItem1, toRightPanelFn) { $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id)); $midmenuItem1.data("id", jsonObj.id); diff --git a/ui/new/scripts/cloud.core2.init.js b/ui/new/scripts/cloud.core2.init.js index 38bce04dbb1..eca3254d4e1 100644 --- a/ui/new/scripts/cloud.core2.init.js +++ b/ui/new/scripts/cloud.core2.init.js @@ -58,37 +58,38 @@ $(document).ready(function() { } var $midmenuItem = $("#midmenu_item"); - function listMidMenuItems(leftmenuId, apiName, jsonResponse1, jsonResponse2, rightPanelJSP, toMidmenu, toRightPanel) { + function listMidMenuItems(leftmenuId, apiName, jsonResponse1, jsonResponse2, rightPanelJSP, afterLoadRightPanelJSP, toMidmenu, toRightPanel) { $("#"+leftmenuId).bind("click", function(event) { - $("#right_panel").load(rightPanelJSP); - $.ajax({ - cache: false, - data: createURL("command="+apiName+"&pagesize="+midmenuItemCount), - dataType: "json", - success: function(json) { - $("#midmenu_container").empty(); - selectedItemsInMidMenu = {}; - - var items = json[jsonResponse1][jsonResponse2]; - if(items != null && items.length > 0) { - for(var i=0; i
- Please wait... -
-