From 1e2c504d3bc5411a91ad8fb290ab7ba27a6b66e8 Mon Sep 17 00:00:00 2001
From: Jessica Wang
Date: Sun, 3 Oct 2010 17:40:47 -0700
Subject: [PATCH] new UI - localize disable HA dialog.
---
client/WEB-INF/classes/resources/resource.properties | 1 +
ui/new/jsp/instance.jsp | 6 ++++++
ui/new/scripts/cloud.core2.instance.js | 8 +++-----
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/client/WEB-INF/classes/resources/resource.properties b/client/WEB-INF/classes/resources/resource.properties
index 49e9d9da128..24e94a0a1a6 100644
--- a/client/WEB-INF/classes/resources/resource.properties
+++ b/client/WEB-INF/classes/resources/resource.properties
@@ -19,4 +19,5 @@ 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
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.
diff --git a/ui/new/jsp/instance.jsp b/ui/new/jsp/instance.jsp
index cfb11df5fa6..8c07deda1e4 100644
--- a/ui/new/jsp/instance.jsp
+++ b/ui/new/jsp/instance.jsp
@@ -1059,4 +1059,10 @@
<%=t.t("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")%>
+
+
+
+ <%=t.t("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")%>
+
+
diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js
index 073bd56b38e..e6f1fbcdc00 100644
--- a/ui/new/scripts/cloud.core2.instance.js
+++ b/ui/new/scripts/cloud.core2.instance.js
@@ -72,6 +72,7 @@ function clickInstanceGroupHeader($arrowIcon) {
initDialog("dialog_change_service_offering");
initDialog("dialog_confirmation_change_root_password");
initDialog("dialog_confirmation_enable_ha");
+ initDialog("dialog_confirmation_disable_ha");
activateDialog($("#dialog_create_template").dialog({
width: 400, //this dialog box has dropdown fields, so need to fix width as 400 instead of 600.
@@ -979,11 +980,8 @@ function doEnableHA($t, selectedItemsInMidMenu, vmListAPIMap) {
}).dialog("open");
}
-function doDisableHA($t, selectedItemsInMidMenu, vmListAPIMap) {
- var message = "Please confirm you want to disable HA for your virtual machine. Once HA is disabled, your Virtual Instance will no longer be be automatically restarted in the event of a failure.
";
-
- $("#dialog_confirmation")
- .html(message)
+function doDisableHA($t, selectedItemsInMidMenu, vmListAPIMap) {
+ $("#dialog_confirmation_disable_ha")
.dialog('option', 'buttons', {
"Confirm": function() {
$(this).dialog("close");