diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index c11b920f910..67d19218a97 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -10,6 +10,7 @@ label.session.expired=Session Expired message.download.volume=Please click 00000 to download volume message.download.ISO=Please click 00000 to download ISO message.download.template=Please click 00000 to download template +label.download.progress=Download Progress #Labels label.SR.name = SR Name-Label diff --git a/client/WEB-INF/classes/resources/messages_es.properties b/client/WEB-INF/classes/resources/messages_es.properties index 15dc178f91c..b0ba9b37d3e 100644 --- a/client/WEB-INF/classes/resources/messages_es.properties +++ b/client/WEB-INF/classes/resources/messages_es.properties @@ -10,6 +10,7 @@ label.session.expired=Session Caducado message.download.volume=Por favor, haga clic 00000 para bajar el volumen message.download.ISO=Por favor, haga clic 00000 para descargar la ISO message.download.template=Por favor, haga clic 00000 para descargar la plantilla +label.download.progress=Progreso de la descarga #Labels label.SR.name = SR Nombre de etiqueta diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties index 11839a6db25..646eeb6b924 100644 --- a/client/WEB-INF/classes/resources/messages_ja.properties +++ b/client/WEB-INF/classes/resources/messages_ja.properties @@ -10,6 +10,7 @@ label.session.expired=Session 期限切れ message.download.volume=をクリックしてください。00000を、ボリュームをダウンロードする message.download.ISO=をクリックしてください。00000をは、ISOをダウンロードする message.download.template=をクリックしてください。00000をテンプレートをダウンロードする +label.download.progress=ダウンロードの進捗状況 #Labels label.SR.name=SRの名 -レーベル diff --git a/client/WEB-INF/classes/resources/messages_zh_CN.properties b/client/WEB-INF/classes/resources/messages_zh_CN.properties index 6519f09fd13..f1a646d245d 100644 --- a/client/WEB-INF/classes/resources/messages_zh_CN.properties +++ b/client/WEB-INF/classes/resources/messages_zh_CN.properties @@ -10,6 +10,7 @@ label.session.expired=session 过期 message.download.volume=请点击00000下载卷 message.download.ISO=请点击00000来下载ISO message.download.template=请点击00000下载模板 +label.download.progress=下载进度 #Labels label.account =帐号 diff --git a/ui/jsp/iso.jsp b/ui/jsp/iso.jsp index 0ae795f629f..4f89d4a2c49 100644 --- a/ui/jsp/iso.jsp +++ b/ui/jsp/iso.jsp @@ -17,7 +17,8 @@ dictionary = { 'label.action.create.vm' : '', 'label.action.create.vm.processing' : '', 'label.action.download.ISO' : '', - 'message.download.ISO' : '' + 'message.download.ISO' : '', + 'label.download.progress' : '' }; @@ -110,17 +111,8 @@ dictionary = { +
-
-
- :
-
-
-
-
-
-
-
:
@@ -130,7 +122,7 @@ dictionary = {
-
+
:
@@ -140,7 +132,7 @@ dictionary = {
-
+
:
@@ -155,7 +147,7 @@ dictionary = {
-
+
:
@@ -170,7 +162,7 @@ dictionary = {
-
+
:
@@ -180,7 +172,7 @@ dictionary = {
-
+
:
@@ -192,7 +184,7 @@ dictionary = {
-
+
:
@@ -202,7 +194,7 @@ dictionary = {
-
+
:
@@ -212,7 +204,7 @@ dictionary = {
-
+
:
@@ -221,7 +213,27 @@ dictionary = {
-
+
+
+
+
+ :
+
+
+
+
+
+
+
+
+
+ :
+
+
+
+
+
+
diff --git a/ui/scripts/cloud.core.iso.js b/ui/scripts/cloud.core.iso.js index 12a7de8e042..f7113fae341 100644 --- a/ui/scripts/cloud.core.iso.js +++ b/ui/scripts/cloud.core.iso.js @@ -347,6 +347,23 @@ function isoJsonToDetailsTab() { if (jsonObj.isready == false) 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)));