diff --git a/client/WEB-INF/classes/resources/resource.properties b/client/WEB-INF/classes/resources/resource.properties index f2b791ada78..6698cb8ba9d 100644 --- a/client/WEB-INF/classes/resources/resource.properties +++ b/client/WEB-INF/classes/resources/resource.properties @@ -1,3 +1,6 @@ +your.session.has.expired = Your session has expired +internet.name.can.not.be.resolved = Internet name can not be resolved +management.server.is.not.accessible = Management server is not accessible please.confirm.you.want.to.detach.an.iso.from.the.virtual.machine = Please confirm you want to detach an ISO from the virtual machine please.specify.the.iso.you.wish.to.attach.to.virtual.machine = Please specify the ISO you wish to attach to virtual instance iso = ISO @@ -14,3 +17,4 @@ display.text = Display Text os.type = OS Type public = Public password.enabled = Password Enabled +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 diff --git a/ui/new/index.jsp b/ui/new/index.jsp index 6ed014b43a2..8f2979097bd 100644 --- a/ui/new/index.jsp +++ b/ui/new/index.jsp @@ -1,4 +1,11 @@ -<%@ page import="java.util.Date" %> +<%@ page import="java.util.*" %> + +<%@ page import="com.cloud.utils.*" %> + +<% + Locale browserLocale = request.getLocale(); + CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); +%> <% long milliseconds = new Date().getTime(); @@ -713,15 +720,21 @@ long milliseconds = new Date().getTime();
- + + diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js index 73e9066bec0..aaa908fab7a 100644 --- a/ui/new/scripts/cloud.core2.instance.js +++ b/ui/new/scripts/cloud.core2.instance.js @@ -70,6 +70,7 @@ function clickInstanceGroupHeader($arrowIcon) { initDialog("dialog_change_name"); initDialog("dialog_change_group"); initDialog("dialog_change_service_offering"); + initDialog("dialog_confirmation_change_root_password"); activateDialog($("#dialog_create_template").dialog({ width: 400, //this dialog box has dropdown fields, so need to fix width as 400 instead of 600. @@ -839,10 +840,9 @@ function doDetachISO($t, selectedItemsInMidMenu, vmListAPIMap) { } function doResetPassword($t, selectedItemsInMidMenu, vmListAPIMap) { - $("#dialog_confirmation") - .html("Please confirm you want to change the ROOT password for your virtual machine(s)
") + $("#dialog_confirmation_change_root_password") .dialog('option', 'buttons', { - "Confirm": function() { + "Yes": function() { $(this).dialog("close"); for(var id in selectedItemsInMidMenu) { var $midMenuItem = selectedItemsInMidMenu[id]; @@ -861,7 +861,7 @@ function doResetPassword($t, selectedItemsInMidMenu, vmListAPIMap) { doActionForMidMenu(id, $t, apiCommand, vmListAPIMap); } }, - "Cancel": function() { + "No": function() { $(this).dialog("close"); } }).dialog("open");