diff --git a/client/WEB-INF/classes/resources/resource.properties b/client/WEB-INF/classes/resources/resource.properties index 260e5ca880e..17649d12d92 100644 --- a/client/WEB-INF/classes/resources/resource.properties +++ b/client/WEB-INF/classes/resources/resource.properties @@ -112,9 +112,6 @@ please.specify.the.new.name.you.want.to.change.for.the.virtual.machine = Please 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 after.changing.service.offering.you.must.restart.the.virtual.machine.for.new.service.offering.to.take.effect = After changing service offering, you must restart the virtual machine for the new service offering to take effect. creating.a.template.of.disk.volume.could.take.up.to.several.hours.depending.on.the.size.of.the.disk.volume = Creating a template of disk volume could take up to several hours depending on the size of the disk volume -please.confirm.you.want.to.change.the.root.password.for.the.virtual.machine = Please confirm you want to change the ROOT password for the virtual machine -please.confirm.you.want.to.enable.HA.for.your.virtual.machine.once.HA.is.enabled.your.virtual.machine.will.be.automatically.restarted.in.the.event.it.is.detected.to.have.failed = Please confirm you want to enable HA for your virtual machine. Once HA is enabled, your virtual machine will be automatically restarted in the event it is detected to have failed. -please.confirm.you.want.to.disable.HA.for.the.virtual.machine.once.HA.is.disabled.the.virtual.machine.will.no.longer.be.automatically.restarted.in.the.event.of.a.failure = Please confirm you want to disable HA for the virtual machine. Once HA is disabled, the virtual machine will no longer be be automatically restarted in the event of a failure. the.ISO.is.used.by.all.zones.please.confirm.you.want.to.delete.it.from.all.zones = The ISO is used by all zones. Please confirm you want to delete it from all zones. please.confirm.you.want.to.delete.the.ISO = Please confirm you want to delete the ISO the.template.is.used.by.all.zones.please.confirm.you.want.to.delete.it.from.all.zones = The template is used by all zones. Please confirm you want to delete it from all zones. @@ -134,12 +131,6 @@ Please.choose.a.OS.preference.for.this.host..Virtual.machines.will.always.be.all please.confirm.you.want.to.delete.the.primary.storage = Please confirm you want to delete the primary storage please.confirm.you.want.to.delete.the.secondary.storage = Please confirm you want to delete the secondary storage -please.confirm.you.want.to.start.instance = Please confirm you want to start instance -please.confirm.you.want.to.stop.instance = Please confirm you want to stop instance -please.confirm.you.want.to.reboot.instance = Please confirm you want to reboot instance -please.confirm.you.want.to.destroy.instance = Please confirm you want to destroy instance -please.confirm.you.want.to.restore.instance = Please confirm you want to restore instance - please.confirm.you.want.to.start.router = Please confirm you want to start router please.confirm.you.want.to.stop.router = Please confirm you want to stop router please.confirm.you.want.to.reboot.router = Please confirm you want to reboot router diff --git a/ui/jsp/instance.jsp b/ui/jsp/instance.jsp index 2c33906c9a7..22e6e2f8dac 100644 --- a/ui/jsp/instance.jsp +++ b/ui/jsp/instance.jsp @@ -1422,73 +1422,6 @@ - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js index e6cac413edf..09a24ab9fe5 100644 --- a/ui/scripts/cloud.core.instance.js +++ b/ui/scripts/cloud.core.instance.js @@ -125,22 +125,8 @@ function afterLoadInstanceJSP() { initDialog("dialog_attach_iso"); initDialog("dialog_change_name"); initDialog("dialog_change_group"); - initDialog("dialog_change_service_offering", 600); - initDialog("dialog_confirmation_change_root_password"); - initDialog("dialog_confirmation_enable_ha"); - initDialog("dialog_confirmation_disable_ha"); - initDialog("dialog_create_template", 400); - initDialog("dialog_confirmation_start_vm"); - initDialog("dialog_confirmation_stop_vm"); - initDialog("dialog_confirmation_reboot_vm"); - initDialog("dialog_confirmation_destroy_vm"); - - if(isAdmin() || isDomainAdmin()) - initDialog("dialog_confirmation_restore_vm"); - - initDialog("dialog_confirmation_start_router"); - initDialog("dialog_confirmation_stop_router"); - initDialog("dialog_confirmation_reboot_router"); + initDialog("dialog_change_service_offering", 600); + initDialog("dialog_create_template", 400); $.ajax({ data: createURL("command=listOsTypes"), @@ -194,7 +180,8 @@ function bindStartVMButton() { return false; } - $("#dialog_confirmation_start_vm") + $("#dialog_confirmation") + .text("Please confirm you want to start instance") .dialog('option', 'buttons', { "Confirm": function() { $(this).dialog("close"); @@ -240,7 +227,8 @@ function bindStopVMButton() { return false; } - $("#dialog_confirmation_stop_vm") + $("#dialog_confirmation") + .text("Please confirm you want to stop instance") .dialog('option', 'buttons', { "Confirm": function() { $(this).dialog("close"); @@ -286,7 +274,8 @@ function bindRebootVMButton() { return false; } - $("#dialog_confirmation_reboot_vm") + $("#dialog_confirmation") + .text("Please confirm you want to reboot instance") .dialog('option', 'buttons', { "Confirm": function() { $(this).dialog("close"); @@ -332,7 +321,8 @@ function bindDestroyVMButton() { return false; } - $("#dialog_confirmation_destroy_vm") + $("#dialog_confirmation") + .text("Please confirm you want to destroy instance") .dialog('option', 'buttons', { "Confirm": function() { $(this).dialog("close"); @@ -1342,7 +1332,8 @@ var vmActionMap = { } function doStartVM($actionLink, $detailsTab, $midmenuItem1) { - $("#dialog_confirmation_start_vm") + $("#dialog_confirmation") + .text("Please confirm you want to start instance") .dialog('option', 'buttons', { "Confirm": function() { $(this).dialog("close"); @@ -1360,7 +1351,8 @@ function doStartVM($actionLink, $detailsTab, $midmenuItem1) { } function doStopVM($actionLink, $detailsTab, $midmenuItem1) { - $("#dialog_confirmation_stop_vm") + $("#dialog_confirmation") + .text("Please confirm you want to stop instance") .dialog('option', 'buttons', { "Confirm": function() { $(this).dialog("close"); @@ -1378,7 +1370,8 @@ function doStopVM($actionLink, $detailsTab, $midmenuItem1) { } function doRebootVM($actionLink, $detailsTab, $midmenuItem1) { - $("#dialog_confirmation_reboot_vm") + $("#dialog_confirmation") + .text("Please confirm you want to reboot instance") .dialog('option', 'buttons', { "Confirm": function() { $(this).dialog("close"); @@ -1396,7 +1389,8 @@ function doRebootVM($actionLink, $detailsTab, $midmenuItem1) { } function doDestroyVM($actionLink, $detailsTab, $midmenuItem1) { - $("#dialog_confirmation_destroy_vm") + $("#dialog_confirmation") + .text("Please confirm you want to destroy instance") .dialog('option', 'buttons', { "Confirm": function() { $(this).dialog("close"); @@ -1414,7 +1408,8 @@ function doDestroyVM($actionLink, $detailsTab, $midmenuItem1) { } function doRestoreVM($actionLink, $detailsTab, $midmenuItem1) { - $("#dialog_confirmation_restore_vm") + $("#dialog_confirmation") + .text("Please confirm you want to restore instance") .dialog('option', 'buttons', { "Confirm": function() { $(this).dialog("close"); @@ -1545,7 +1540,8 @@ function doDetachISO($actionLink, $detailsTab, $midmenuItem1) { } function doResetPassword($actionLink, $detailsTab, $midmenuItem1) { - $("#dialog_confirmation_change_root_password") + $("#dialog_confirmation") + .text("Please confirm you want to change the ROOT password for the virtual machine") .dialog('option', 'buttons', { "Yes": function() { $(this).dialog("close"); @@ -2211,7 +2207,8 @@ var vmRouterActionMap = { } function doStartVmRouter($actionLink, $subgridItem) { - $("#dialog_confirmation_start_router") + $("#dialog_confirmation") + .text("Please confirm you want to start router") .dialog('option', 'buttons', { "Confirm": function() { $(this).dialog("close"); @@ -2229,7 +2226,8 @@ function doStartVmRouter($actionLink, $subgridItem) { } function doStopVmRouter($actionLink, $subgridItem) { - $("#dialog_confirmation_stop_router") + $("#dialog_confirmation") + .text("Please confirm you want to stop router") .dialog('option', 'buttons', { "Confirm": function() { $(this).dialog("close"); @@ -2247,7 +2245,8 @@ function doStopVmRouter($actionLink, $subgridItem) { } function doRebootVmRouter($actionLink, $subgridItem) { - $("#dialog_confirmation_reboot_router") + $("#dialog_confirmation") + .text("Please confirm you want to reboot router") .dialog('option', 'buttons', { "Confirm": function() { $(this).dialog("close");