From f04b45750898c51cb32dbdbaa91d4cfde4ad917c Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 21 Jan 2011 16:11:12 -0800
Subject: [PATCH] bug 7116: System VM page - clean up the confirmation dialogs
 to use a single dialog (i.e. "dialog_confirmation").

---
 .../classes/resources/resource.properties     |  9 ---------
 ui/jsp/systemvm.jsp                           | 17 ----------------
 ui/scripts/cloud.core.systemvm.js             | 20 +++++++++----------
 3 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/client/WEB-INF/classes/resources/resource.properties b/client/WEB-INF/classes/resources/resource.properties
index a31e3b01196..3c78227e0c4 100644
--- a/client/WEB-INF/classes/resources/resource.properties
+++ b/client/WEB-INF/classes/resources/resource.properties
@@ -126,15 +126,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.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
-
-
-please.confirm.you.want.to.start.systemVM = Please confirm you want to start system VM
-please.confirm.you.want.to.stop.systemVM = Please confirm you want to stop system VM
-please.confirm.you.want.to.reboot.systemVM = Please confirm you want to reboot system VM
-
 customizable.during.VM.creation = Customizable during VM creation
 
 physical.resources = Physical Resources
diff --git a/ui/jsp/systemvm.jsp b/ui/jsp/systemvm.jsp
index e98bea5d009..4623a04dd40 100644
--- a/ui/jsp/systemvm.jsp
+++ b/ui/jsp/systemvm.jsp
@@ -187,23 +187,6 @@
     </div>
 </div>
 <!-- view console template (end)  -->
-<!-- dialogs -->
-<div id="dialog_confirmation_start_systemVM" title="Confirmation" style="display: none">
-    <p>
-        <%=t.t("please.confirm.you.want.to.start.systemVM")%>
-    </p>
-</div>
-<div id="dialog_confirmation_stop_systemVM" title="Confirmation" style="display: none">
-    <p>
-        <%=t.t("please.confirm.you.want.to.stop.systemVM")%>
-    </p>
-</div>
-<div id="dialog_confirmation_reboot_systemVM" title="Confirmation" style="display: none">
-    <p>
-        <%=t.t("please.confirm.you.want.to.reboot.systemVM")%>
-    </p>
-</div>
-
 
 <div id="hidden_container">
     <!-- advanced search popup (begin) -->
diff --git a/ui/scripts/cloud.core.systemvm.js b/ui/scripts/cloud.core.systemvm.js
index 672ed143ecf..002b99be28b 100644
--- a/ui/scripts/cloud.core.systemvm.js
+++ b/ui/scripts/cloud.core.systemvm.js
@@ -42,15 +42,10 @@
 	} 	
 	
 	return moreCriteria.join("");          
- }
+}
  
- function afterLoadSystemVmJSP($midmenuItem1) {
-    //hideMiddleMenu();			
-    //systemvmToRightPanel($midmenuItem1);		
-    
-    initDialog("dialog_confirmation_start_systemVM");
-    initDialog("dialog_confirmation_stop_systemVM");
-    initDialog("dialog_confirmation_reboot_systemVM");
+function afterLoadSystemVmJSP($midmenuItem1) {  
+  
 }
 
 function systemvmToMidmenu(jsonObj, $midmenuItem1) {
@@ -184,7 +179,8 @@ var systemVmActionMap = {
 }   
 
 function doStartSystemVM($actionLink, $detailsTab, $midmenuItem1) {   
-    $("#dialog_confirmation_start_systemVM")	
+    $("#dialog_confirmation")
+    .text("Please confirm you want to start system VM")	
     .dialog('option', 'buttons', { 						
 	    "Confirm": function() { 
 		    $(this).dialog("close"); 			
@@ -202,7 +198,8 @@ function doStartSystemVM($actionLink, $detailsTab, $midmenuItem1) {
 }   
 
 function doStopSystemVM($actionLink, $detailsTab, $midmenuItem1) {     
-    $("#dialog_confirmation_stop_systemVM")	
+    $("#dialog_confirmation")	
+    .text("Please confirm you want to stop system VM")
     .dialog('option', 'buttons', { 						
 	    "Confirm": function() { 
 		    $(this).dialog("close"); 			
@@ -220,7 +217,8 @@ function doStopSystemVM($actionLink, $detailsTab, $midmenuItem1) {
 }   
    
 function doRebootSystemVM($actionLink, $detailsTab, $midmenuItem1) {   
-    $("#dialog_confirmation_reboot_systemVM")	
+    $("#dialog_confirmation")	
+    .text("Please confirm you want to reboot system VM")
     .dialog('option', 'buttons', { 						
 	    "Confirm": function() { 
 		    $(this).dialog("close");