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

ISO page - add Download Progress Bar that shows when download progress is not finished and hides when download progress finishes.

Browse Source
This commit is contained in:
Jessica Wang 2011-02-15 14:36:04 -08:00
parent db2bd762a8
commit 5c010cfce6
6 changed files with 53 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,7 @@ label.session.expired=Session Expired
message.download.volume=Please click <a href="#">00000</a> to download volume
message.download.ISO=Please click <a href="#">00000</a> to download ISO
message.download.template=Please click <a href="#">00000</a> to download template
label.download.progress=Download Progress
#Labels
label.SR.name = SR Name-Label

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

@ -10,6 +10,7 @@ label.session.expired=Session Caducado
message.download.volume=Por favor, haga clic <a href="#">00000</a> para bajar el volumen
message.download.ISO=Por favor, haga clic <a href="#">00000</a> para descargar la ISO
message.download.template=Por favor, haga clic <a href="#">00000</a> para descargar la plantilla
label.download.progress=Progreso de la descarga
#Labels
label.SR.name = SR Nombre de etiqueta

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

@ -10,6 +10,7 @@ label.session.expired=Session 期限切れ
message.download.volume=をクリックしてください。<a href="#">00000</a>を、ボリュームをダウンロードする
message.download.ISO=をクリックしてください。<a href="#">00000</a>をは、ISOをダウンロードする
message.download.template=をクリックしてください。<a href="#">00000</a>をテンプレートをダウンロードする
label.download.progress=ダウンロードの進捗状況
#Labels
label.SR.name=SRの名 -レーベル

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

@ -10,6 +10,7 @@ label.session.expired=session 过期
message.download.volume=请点击<a href="#">00000</a>下载卷
message.download.ISO=请点击<a href="#">00000</a>来下载ISO
message.download.template=请点击<a href="#">00000</a>下载模板
label.download.progress=下载进度
#Labels
label.account =帐号

50
ui/jsp/iso.jsp
View File

@ -17,7 +17,8 @@ dictionary = {
'label.action.create.vm' : '<fmt:message key="label.action.create.vm"/>',
'label.action.create.vm.processing' : '<fmt:message key="label.action.create.vm.processing"/>',
'label.action.download.ISO' : '<fmt:message key="label.action.download.ISO"/>',
'message.download.ISO' : '<fmt:message key="message.download.ISO"/>'
'message.download.ISO' : '<fmt:message key="message.download.ISO"/>',
'label.download.progress' : '<fmt:message key="label.download.progress"/>'
};
</script>
@ -110,17 +111,8 @@ dictionary = {
<div id="displaytext_edit_errormsg" style="display:none"></div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.status"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="status">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.size"/>:</div>
@ -130,7 +122,7 @@ dictionary = {
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.bootable"/>:</div>
@ -140,7 +132,7 @@ dictionary = {
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.public"/>:</div>
@ -155,7 +147,7 @@ dictionary = {
</div>
</div>
<div class="grid_rows odd">
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.featured"/>:</div>
@ -170,7 +162,7 @@ dictionary = {
</div>
</div>
<div class="grid_rows even">
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.cross.zones"/>:</div>
@ -180,7 +172,7 @@ dictionary = {
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.os.type"/>:</div>
@ -192,7 +184,7 @@ dictionary = {
</select>
</div>
</div>
<div class="grid_rows even">
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.account"/>:</div>
@ -202,7 +194,7 @@ dictionary = {
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.domain"/>:</div>
@ -212,7 +204,7 @@ dictionary = {
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.created"/>:</div>
@ -222,6 +214,26 @@ dictionary = {
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.status"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="status">
</div>
</div>
</div>
<div class="grid_rows odd" id="progressbar_container">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.download.progress"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div id="progressbar"></div>
</div>
</div>
</div>
<div class="grid_botactionpanel">
<div class="gridbot_buttons" id="save_button" style="display:none;"><fmt:message key="label.save"/></div>

17
ui/scripts/cloud.core.iso.js
View File

@ -348,6 +348,23 @@ function isoJsonToDetailsTab() {
status = fromdb(jsonObj.status);
setTemplateStateInRightPanel(status, $thisTab.find("#status"));
if(jsonObj.isready == true){
$("#progressbar_container").hide();
}
else {
$("#progressbar_container").show();
var progressBarValue = 0;
if(jsonObj.status != null && jsonObj.status.indexOf("%") != -1) { //e.g. jsonObj.status == "95% Downloaded"
var s = jsonObj.status.substring(0, jsonObj.status.indexOf("%")); //e.g. s == "95"
if(isNaN(s) == false) {
progressBarValue = parseInt(s); //e.g. progressBarValue == 95
}
}
$("#progressbar").progressbar({
value: progressBarValue //e.g. progressBarValue == 95
});
}
if(jsonObj.size != null)
$thisTab.find("#size").text(convertBytes(parseInt(jsonObj.size)));
else