diff --git a/client/WEB-INF/classes/resources/resource.properties b/client/WEB-INF/classes/resources/resource.properties index 0310e1c3f06..26e7b2d9b84 100644 --- a/client/WEB-INF/classes/resources/resource.properties +++ b/client/WEB-INF/classes/resources/resource.properties @@ -1 +1,2 @@ -Details = Details +please.confirm.you.want.to.detach.an.iso.from.the.virtual.machine = Please confirm you want to detach an ISO from the virtual machine + diff --git a/ui/new/jsp/instance.jsp b/ui/new/jsp/instance.jsp index c12f27d82a2..8cb597edf11 100644 --- a/ui/new/jsp/instance.jsp +++ b/ui/new/jsp/instance.jsp @@ -1036,3 +1036,9 @@ + + +
+ diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js index 1e438dd740b..621322685c2 100644 --- a/ui/new/scripts/cloud.core2.instance.js +++ b/ui/new/scripts/cloud.core2.instance.js @@ -64,6 +64,8 @@ function clickInstanceGroupHeader($arrowIcon) { var $noDiskOfferingTemplate = $("#vm_popup_disk_offering_template_no"); var $customDiskOfferingTemplate = $("#vm_popup_disk_offering_template_custom"); var $existingDiskOfferingTemplate = $("#vm_popup_disk_offering_template_existing"); + + initDialog("dialog_detach_iso_from_vm"); activateDialog($("#dialog_attach_iso").dialog({ width: 600, @@ -839,17 +841,16 @@ function doAttachISO($t, selectedItemsInMidMenu, vmListAPIMap) { } function doDetachISO($t, selectedItemsInMidMenu, vmListAPIMap) { - $("#dialog_confirmation") - .html("Please confirm you want to detach an ISO from the virtual machine(s)
") + $("#dialog_detach_iso_from_vm") .dialog('option', 'buttons', { - "Confirm": function() { + "Yes": function() { $(this).dialog("close"); for(var id in selectedItemsInMidMenu) { var apiCommand = "command=detachIso&virtualmachineid="+id; doActionForMidMenu(id, $t, apiCommand, vmListAPIMap); } }, - "Cancel": function() { + "No": function() { $(this).dialog("close"); } }).dialog("open"); diff --git a/ui/new/scripts/cloud.core2.js b/ui/new/scripts/cloud.core2.js index 028b8f5e786..fcdb3055831 100644 --- a/ui/new/scripts/cloud.core2.js +++ b/ui/new/scripts/cloud.core2.js @@ -743,7 +743,14 @@ function setVmStateInRightPanel(stateValue, $stateField) { $stateField.text(stateValue).removeClass("green red").addClass("gray"); } - +function initDialog(elementId) { + $("#"+elementId).dialog({ + width: 600, + autoOpen: false, + modal: true, + zIndex: 2000 + }); +}