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: System VM page - clean up the confirmation dialogs to use a single dialog (i.e. "dialog_confirmation").

Browse Source
This commit is contained in:
Jessica Wang 2011-01-21 16:11:12 -08:00
parent 067811475f
commit f04b457508
3 changed files with 9 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

17
ui/jsp/systemvm.jsp
View File

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

20
ui/scripts/cloud.core.systemvm.js
View File

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