etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 7116: primary storage page, secondary storage page - clean up the confirmation dialogs to use a single dialog (i.e. "dialog_confirmation").

This commit is contained in:
Jessica Wang 2011-01-21 16:43:41 -08:00
parent 958e7fe8df
commit 28f6a5ddf7
4 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,9 +119,6 @@ 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.restart.your.management.server.for.your.new.settings.to.take.effect = Please RESTART your management server for your new settings to take effect
Please.choose.a.OS.preference.for.this.host..Virtual.machines.will.always.be.allocated.to.hosts.with.an.OS.preference.that.matches.with.the.OS.type.of.the.template.chosen.for.the.virtual.machine.before.choosing.other.hosts. = Please choose a OS preference for this host. Virtual machines will always be allocated to hosts with an OS preference that matches with the OS type of the template chosen for the virtual machine before choosing other hosts.
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
customizable.during.VM.creation = Customizable during VM creation
physical.resources = Physical Resources

8
ui/jsp/primarystorage.jsp
View File

@ -302,14 +302,6 @@
</div>
</div>
<!-- dialogs -->
<div id="dialog_confirmation_delete_primarystorage" title="Confirmation" style="display: none">
<p>
<%=t.t("please.confirm.you.want.to.delete.the.primary.storage")%>
</p>
</div>
<div id="hidden_container">
<!-- advanced search popup (begin) -->
<div class="adv_searchpopup_bg" id="advanced_search_popup" style="display: none;">

7
ui/scripts/cloud.core.primarystorage.js
View File

@ -63,9 +63,7 @@ function primarystorageToRightPanel($midmenuItem1) {
function afterLoadPrimaryStorageJSP() {
//add pool dialog
initDialog("dialog_add_pool");
bindEventHandlerToDialogAddPool($("#dialog_add_pool"));
initDialog("dialog_confirmation_delete_primarystorage");
bindEventHandlerToDialogAddPool($("#dialog_add_pool"));
primaryStorageRefreshDataBinding();
}
@ -324,7 +322,8 @@ function doCancelMaintenanceModeForPrimaryStorage($actionLink, $detailsTab, $mid
function doDeletePrimaryStorage($actionLink, $detailsTab, $midmenuItem1){
var jsonObj = $midmenuItem1.data("jsonObj");
$("#dialog_confirmation_delete_primarystorage")
$("#dialog_confirmation")
.text("Please confirm you want to delete the primary storage")
.dialog("option", "buttons", {
"OK": function() {
$(this).dialog("close");

2
ui/scripts/cloud.core.secondarystorage.js
View File

@ -137,7 +137,7 @@ var secondaryStorageActionMap = {
function doDeleteSecondaryStorage($actionLink, $detailsTab, $midmenuItem1) {
var jsonObj = $midmenuItem1.data("jsonObj");
$("#dialog_info")
$("#dialog_confirmation")
.text("Please confirm you want to delete this secondary storage")
.dialog('option', 'buttons', {
"Confirm": function() {