From faeff7707faa73127b973a781f85709e09b171b1 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 18 Oct 2010 15:46:10 -0700
Subject: [PATCH] new UI - confirm action before enable maintenance on host.

---
 client/WEB-INF/classes/resources/resource.properties | 2 +-
 ui/new/jsp/resource.jsp                              | 2 +-
 ui/new/scripts/cloud.core2.resource.js               | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/client/WEB-INF/classes/resources/resource.properties b/client/WEB-INF/classes/resources/resource.properties
index 95f685310c0..5ff959f979c 100644
--- a/client/WEB-INF/classes/resources/resource.properties
+++ b/client/WEB-INF/classes/resources/resource.properties
@@ -121,5 +121,5 @@ please.confirm.you.want.to.enable.account = Please confirm you want to enable ac
 please.select.an.available.zone.to.associate.your.new.ip.with..acquiring.additional.ip.may.cost.you.an.additional.dollars.per.month. = Please select an availability zone to associate your new IP with. Acquiring additional IP may cost you an additional dollars per month.
 please.confirm.you.want.to.release.this.IP.address = Please confirm you want to release this IP address
 please.restart.your.management.server.for.your.new.settings.to.take.effect = Please RESTART your management server for your new settings to take effect
-Please.confirm.you.want.to.enable.maintenance.for.the.host..Enabling.maintenance.mode.will.cause.a.live.migration.of.all.running.instances.on.this.host.to.any.available.host..An.alert.will.be.sent.to.the.admin.when.this.process.has.been.completed. = Please confirm you want to enable maintenance for the host. Enabling maintenance mode will cause a live migration of all running instances on this host to any available host. An alert will be sent to the admin when this process has been completed.
+enabling.maintenance.mode.will.cause.a.live.migration.of.all.running.instances.on.this.host.to.any.available.host = Enabling maintenance mode will cause a live migration of all running instances on this host to any available host.
 
diff --git a/ui/new/jsp/resource.jsp b/ui/new/jsp/resource.jsp
index 58dd385e3a6..ce2cc2e6091 100644
--- a/ui/new/jsp/resource.jsp
+++ b/ui/new/jsp/resource.jsp
@@ -1086,6 +1086,6 @@
 <!-- dialogs -->
 <div id="dialog_confirmation_enable_maintenance" title="Confirmation" style="display: none">
     <p>        
-        <%=t.t("Please.confirm.you.want.to.enable.maintenance.for.the.host..Enabling.maintenance.mode.will.cause.a.live.migration.of.all.running.instances.on.this.host.to.any.available.host..An.alert.will.be.sent.to.the.admin.when.this.process.has.been.completed.")%>
+        <%=t.t("enabling.maintenance.mode.will.cause.a.live.migration.of.all.running.instances.on.this.host.to.any.available.host")%>
     </p>
 </div>
diff --git a/ui/new/scripts/cloud.core2.resource.js b/ui/new/scripts/cloud.core2.resource.js
index e8a68906892..0101702b013 100644
--- a/ui/new/scripts/cloud.core2.resource.js
+++ b/ui/new/scripts/cloud.core2.resource.js
@@ -663,6 +663,7 @@ function afterLoadResourceJSP() {
 	initDialog("dialog_add_pool");
 	initDialog("dialog_add_secondarystorage");
 	initDialog("dialog_add_vlan_for_zone");
+	initDialog("dialog_confirmation_enable_maintenance");
 	
 	// if hypervisor is KVM, limit the server option to NFS for now
 	if (getHypervisorType() == 'kvm') 
@@ -1208,8 +1209,8 @@ function doEnableMaintenanceMode($actionLink, $detailsTab, midmenuItemId){
        
     $("#dialog_confirmation_enable_maintenance")
     .dialog("option", "buttons", {	                    
-     "Add": function() {
-         $(this).dialog("close");           
+     "OK": function() {
+         $(this).dialog("close");      
          var id = jsonObj.id;
          var apiCommand = "command=prepareHostForMaintenance&id="+id;
     	 doActionToDetailsTab(id, $actionLink, apiCommand, midmenuItemId);