bug 7116: volume page, snapshot page, IP Address page - cleanup the confirmation dialogs to use a single dialog (i.e. "dialog_confirmation").

client/WEB-INF/classes/resources/resource.properties

@@ -121,7 +121,6 @@ please.confirm.you.want.to.disable.account.that.will.prevent.account.access.to.t
 please.confirm.you.want.to.lock.account.that.will.prevent.account.access.to.the.cloud = Please confirm you want to lock account that will prevent account access to the cloud.
 please.confirm.you.want.to.enable.account = Please confirm you want to enable account.
 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
 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.
 please.confirm.you.want.to.cancel.maintenance.for.the.host = Please confirm you want to cancel maintenance for the host

ui/jsp/ipaddress.jsp

@@ -603,12 +603,6 @@
 <!-- VPN Template (end) -->
 
 <!--  dialogs (begin) -->
-<div id="dialog_confirmation_release_ip" title="Confirmation" style="display:none">
-    <p>
-        <%=t.t("please.confirm.you.want.to.release.this.IP.address")%>
-    </p>
-</div>
-
 <div id="dialog_confirmation_remove_vpnuser" title="Confirmation" style="display:none">
     <p>
 		Please confirm you want to remove VPN access from the following user: <span id="username"></span>

ui/jsp/snapshot.jsp

@@ -144,12 +144,6 @@
 </div>
 <!-- Add Volume Dialog from Snapshot (end) -->
 
-<!-- snapshot confirmation dialog (begin) -->
-<div id="dialog_confirmation_delete_snapshot" title="Confirmation" style="display:none">
-    <p>Please confirm you want to delete the snapshot.</p>   
-</div>
-<!-- snapshot confirmation dialog (end) -->
-
 <!-- Create template from snapshot (begin) -->
 <div id="dialog_create_template_from_snapshot" title="Create Template from Snapshot" style="display:none">	
 	<div class="dialog_formcontent">

ui/jsp/volume.jsp

@@ -287,12 +287,6 @@
 </div>
 <!-- Create Snapshot Dialog (end) -->
 
-<!-- snapshot confirmation dialog (begin) -->
-<div id="dialog_confirmation_delete_snapshot" title="Confirmation" style="display:none">
-    <p>Please confirm you want to delete the snapshot.</p>   
-</div>
-<!-- snapshot confirmation dialog (end) -->
-
 <!-- Recurring Snapshots Dialog (begin) -->
 <div id="dialog_recurring_snapshot" title="Recurring Snapshot" style="display:none;">
     <div class="dialog_snapshotcontainer">

ui/scripts/cloud.core.ipaddress.js

@@ -58,7 +58,6 @@ function afterLoadIpJSP() {
         
     //dialogs
     initDialog("dialog_acquire_public_ip", 325);
-    initDialog("dialog_confirmation_release_ip");
 	initDialog("dialog_enable_vpn");
 	initDialog("dialog_disable_vpn");
 	initDialog("dialog_add_vpnuser");
@@ -1117,7 +1116,8 @@ function doReleaseIp($actionLink, $detailsTab, $midmenuItem1) {
     var jsonObj = $midmenuItem1.data("jsonObj");
     var ipaddress = jsonObj.ipaddress;
     
-    $("#dialog_confirmation_release_ip")	
+    $("#dialog_confirmation")
+    .text("Please confirm you want to release this IP address")	
 	.dialog('option', 'buttons', { 						
 		"Confirm": function() { 
 		    $(this).dialog("close");			

ui/scripts/cloud.core.snapshot.js

@@ -44,8 +44,7 @@ function snapshotGetSearchParams() {
 }
 
 function afterLoadSnapshotJSP() {    
-    initDialog("dialog_add_volume_from_snapshot");          
+    initDialog("dialog_add_volume_from_snapshot");  
-	initDialog("dialog_confirmation_delete_snapshot");		
     initCreateTemplateFromSnapshotDialog();
 }
 
@@ -195,7 +194,8 @@ var snapshotActionMap = {
 }   
 
 function doSnapshotDelete($actionLink, $thisTab, $midmenuItem1) {
-	$("#dialog_confirmation_delete_snapshot")	
+	$("#dialog_confirmation")	
+	.text("Please confirm you want to delete the snapshot")
     .dialog('option', 'buttons', { 						
 	    "Confirm": function() { 
 		    $(this).dialog("close"); 	

ui/scripts/cloud.core.volume.js

@@ -54,8 +54,7 @@ function afterLoadVolumeJSP() {
     initDialog("dialog_add_volume");	
     initDialog("dialog_attach_volume");	
     initDialog("dialog_add_volume_from_snapshot");	
-    initDialog("dialog_create_template_from_snapshot", 450);    
+    initDialog("dialog_create_template_from_snapshot", 450);    	
-	initDialog("dialog_confirmation_delete_snapshot");
 	initDialog("dialog_download_volume");
 	
 	if(isAdmin())
@@ -985,7 +984,8 @@ var volumeSnapshotActionMap = {
 }  
 
 function doSnapshotDelete($actionLink, $subgridItem) {
-	$("#dialog_confirmation_delete_snapshot")	
+	$("#dialog_confirmation")	
+	.text("Please confirm you want to delete the snapshot")
     .dialog('option', 'buttons', { 						
 	    "Confirm": function() { 
 		    $(this).dialog("close");