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

new UI - ISO page - add cross zones field. localize delete ISO dialog.

Browse Source
This commit is contained in:
Jessica Wang 2010-10-03 18:03:00 -07:00
parent 1e2c504d3b
commit b732327fce
3 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,4 +20,6 @@ password.enabled = Password Enabled
please.confirm.you.want.to.change.the.root.password.for.the.virtual.machine = Please confirm you want to change the ROOT password for the virtual machine
please.confirm.you.want.to.enable.HA.for.your.virtual.machine.once.HA.is.enabled.your.virtual.machine.will.be.automatically.restarted.in.the.event.it.is.detected.to.have.failed = Please confirm you want to enable HA for your virtual machine. Once HA is enabled, your virtual machine will be automatically restarted in the event it is detected to have failed.
please.confirm.you.want.to.disable.HA.for.the.virtual.machine.once.HA.is.disabled.the.virtual.machine.will.no.longer.be.automatically.restarted.in.the.event.of.a.failure = Please confirm you want to disable HA for the virtual machine. Once HA is disabled, the virtual machine will no longer be be automatically restarted in the event of a failure.
the.ISO.is.used.by.all.zones.please.confirm.you.want.to.delete.it.from.all.zones = The ISO is used by all zones. Please confirm you want to delete it from all zones.
please.confirm.you.want.to.delete.the.ISO = Please confirm you want to delete the ISO

23
ui/new/jsp/iso.jsp
View File

@ -140,6 +140,16 @@
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("crossZones")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="crossZones">
</div>
</div>
</div>
</div>
<div class="grid_botactionpanel">
<div class="gridbot_buttons" id="save_button" style="display:none;">Save</div>
@ -252,3 +262,16 @@
</div>
</div>
<!-- Create VM from template/ISO (end) -->
<div id="dialog_confirmation_delete_iso_all_zones" title="Confirmation" style="display:none">
<p>
<%=t.t("the.ISO.is.used.by.all.zones.please.confirm.you.want.to.delete.it.from.all.zones")%>
</p>
</div>
<div id="dialog_confirmation_delete_iso" title="Confirmation" style="display:none">
<p>
<%=t.t("please.confirm.you.want.to.delete.the.ISO")%>
</p>
</div>

21
ui/new/scripts/cloud.core2.iso.js
View File

@ -151,6 +151,9 @@ function afterLoadIsoJSP() {
});
//initialize dialog box ***
initDialog("dialog_confirmation_delete_iso_all_zones");
initDialog("dialog_confirmation_delete_iso");
activateDialog($("#dialog_copy_iso").dialog({
width:300,
autoOpen: false,
@ -213,13 +216,14 @@ function isoJsonToDetailsTab(jsonObj) {
if(jsonObj.size != null)
$detailsTab.find("#size").text(convertBytes(parseInt(jsonObj.size)));
var status = "Ready";
if (jsonObj.isready == "false")
status = jsonObj.isostatus;
$detailsTab.find("#status").text(status);
setBooleanField(jsonObj.bootable, $detailsTab.find("#bootable"));
setBooleanField(jsonObj.bootable, $detailsTab.find("#bootable"));
setBooleanField(jsonObj.crossZones, $detailsTab.find("#crossZones"));
setDateField(jsonObj.created, $detailsTab.find("#created"));
@ -348,14 +352,13 @@ function doDeleteIso($actionLink, listAPIMap, $detailsTab) {
if (zoneId != null)
moreCriteria.push("&zoneid="+zoneId);
var htmlMsg;
var $dialog1;
if(jsonObj.crossZones == "true")
htmlMsg = "<p>ISO <b>"+name+"</b> is used by all zones. Please confirm you want to delete it from all zones.</p>";
$dialog1 = $("#dialog_confirmation_delete_iso_all_zones");
else
htmlMsg = "<p>Please confirm you want to delete ISO <b>"+name+"</b>.</p>";
$("#dialog_confirmation")
.html(htmlMsg)
$dialog1 = $("#dialog_confirmation_delete_iso");
$dialog1
.dialog('option', 'buttons', {
"Confirm": function() {
$(this).dialog("close");