apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-15 18:12:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jessica Wang 2011-01-21 15:27:37 -08:00
parent 61ce43bdff
commit c44dc97f31
7 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/WEB-INF/classes/resources/resource.properties
View File

@ -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

6
ui/jsp/ipaddress.jsp
View File

@ -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>

6
ui/jsp/snapshot.jsp
View File

@ -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">

6
ui/jsp/volume.jsp
View File

@ -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">

4
ui/scripts/cloud.core.ipaddress.js
View File

@ -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");

6
ui/scripts/cloud.core.snapshot.js
View File

@ -44,8 +44,7 @@ function snapshotGetSearchParams() {
}
function afterLoadSnapshotJSP() {
initDialog("dialog_add_volume_from_snapshot");
initDialog("dialog_confirmation_delete_snapshot");
initDialog("dialog_add_volume_from_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");

6
ui/scripts/cloud.core.volume.js
View File

@ -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_confirmation_delete_snapshot");
initDialog("dialog_create_template_from_snapshot", 450);
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");