diff --git a/client/WEB-INF/classes/resources/resource.properties b/client/WEB-INF/classes/resources/resource.properties index cf53701b1f9..12e28ef9ecc 100644 --- a/client/WEB-INF/classes/resources/resource.properties +++ b/client/WEB-INF/classes/resources/resource.properties @@ -2,4 +2,8 @@ please.confirm.you.want.to.detach.an.iso.from.the.virtual.machine = Please confi please.specify.the.iso.you.wish.to.attach.to.virtual.machine = Please specify the ISO you wish to attach to virtual instance iso = ISO no.available.iso = No Available ISO +please.specify.the.new.name.you.want.to.change.for.the.virtual.machine = Please specify the new name you want to change for the virtual instance +instance.name = Instance Name +please.specify.the.new.group.you.want.to.assign.the.virtual.machine.to = Please specify the new group you want to assign the virtual machine to +group.name = Group Name diff --git a/ui/new/jsp/instance.jsp b/ui/new/jsp/instance.jsp index 1e29e0dfb5d..bb63257e5c4 100644 --- a/ui/new/jsp/instance.jsp +++ b/ui/new/jsp/instance.jsp @@ -684,25 +684,7 @@ - -
+ - - + + + + + + + diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js index d04366abde6..48137f4ee7d 100644 --- a/ui/new/scripts/cloud.core2.instance.js +++ b/ui/new/scripts/cloud.core2.instance.js @@ -66,13 +66,9 @@ function clickInstanceGroupHeader($arrowIcon) { var $existingDiskOfferingTemplate = $("#vm_popup_disk_offering_template_existing"); initDialog("dialog_detach_iso_from_vm"); - initDialog("dialog_attach_iso"); - - activateDialog($("#dialog_change_name").dialog({ - autoOpen: false, - modal: true, - zIndex: 2000 - })); + initDialog("dialog_attach_iso"); + initDialog("dialog_change_name"); + initDialog("dialog_change_group"); activateDialog($("#dialog_change_service_offering").dialog({ width: 600, @@ -80,13 +76,7 @@ function clickInstanceGroupHeader($arrowIcon) { modal: true, zIndex: 2000 })); - - activateDialog($("#dialog_change_group").dialog({ - autoOpen: false, - modal: true, - zIndex: 2000 - })); - + activateDialog($("#dialog_create_template").dialog({ width: 400, autoOpen: false, @@ -815,7 +805,7 @@ function doAttachISO($t, selectedItemsInMidMenu, vmListAPIMap) { $("#dialog_attach_iso") .dialog('option', 'buttons', { - "Confirm": function() { + "OK": function() { $(this).dialog("close"); var isoId = $("#dialog_attach_iso #attach_iso_select").val(); if (isoId == "none") { @@ -837,14 +827,14 @@ function doAttachISO($t, selectedItemsInMidMenu, vmListAPIMap) { function doDetachISO($t, selectedItemsInMidMenu, vmListAPIMap) { $("#dialog_detach_iso_from_vm") .dialog('option', 'buttons', { - "Yes": function() { + "OK": function() { $(this).dialog("close"); for(var id in selectedItemsInMidMenu) { var apiCommand = "command=detachIso&virtualmachineid="+id; doActionForMidMenu(id, $t, apiCommand, vmListAPIMap); } }, - "No": function() { + "Cancel": function() { $(this).dialog("close"); } }).dialog("open"); @@ -882,7 +872,7 @@ function doResetPassword($t, selectedItemsInMidMenu, vmListAPIMap) { function doChangeName($t, selectedItemsInMidMenu, vmListAPIMap) { $("#dialog_change_name") .dialog('option', 'buttons', { - "Confirm": function() { + "OK": function() { var thisDialog = $(this); thisDialog.dialog("close"); @@ -949,7 +939,7 @@ function doChangeService($t, selectedItemsInMidMenu, vmListAPIMap) { function doChangeGroup($t, selectedItemsInMidMenu, vmListAPIMap) { $("#dialog_change_group") .dialog('option', 'buttons', { - "Confirm": function() { + "OK": function() { var thisDialog = $(this); thisDialog.dialog("close");