From c22bd9ca3796ffd2a99531d859981772e26eb644 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Fri, 11 Feb 2011 20:26:21 -0800 Subject: [PATCH] fix a bug that Download ISO, Download Template showed # instead of URL in dialog box. --- client/WEB-INF/classes/resources/messages.properties | 4 ++-- client/WEB-INF/classes/resources/messages_es.properties | 4 +--- client/WEB-INF/classes/resources/messages_ja.properties | 2 -- client/WEB-INF/classes/resources/messages_zh_CN.properties | 4 ++-- ui/scripts/cloud.core.iso.js | 2 +- ui/scripts/cloud.core.template.js | 2 +- 6 files changed, 7 insertions(+), 11 deletions(-) diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index 91252a843d8..123e4fd299a 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -7,6 +7,8 @@ label.root.disk.offering=Root Disk Offering label.confirmation=Confirmation label.alert=Alert label.session.expired=Session Expired +message.download.ISO=Please click 00000 to download ISO +message.download.template=Please click 00000 to download template #Labels label.SR.name = SR Name-Label @@ -676,8 +678,6 @@ message.delete.account=Please confirm that you want to delete this account. message.detach.iso.confirm=Please confirm that you want to detach the ISO from this virtual instance. message.disable.account=Please confirm that you want to disable this account. By disabling the account, all users for this account will no longer have access to their cloud resources. All running virtual machines will be immediately shut down. message.disable.vpn.access=Please confirm that you want to disable VPN Access. -message.download.ISO=Please click # to download ISO -message.download.template=Please click # to download template message.edit.confirm=Please confirm that your changes before clicking 'Save'. message.edit.limits=Please specify limits to the following resources. A "-1" indicates no limit to the amount of resources create. message.enable.account=Please confirm that you want to enable this account. diff --git a/client/WEB-INF/classes/resources/messages_es.properties b/client/WEB-INF/classes/resources/messages_es.properties index 092b5afb9a8..61ceeb760eb 100644 --- a/client/WEB-INF/classes/resources/messages_es.properties +++ b/client/WEB-INF/classes/resources/messages_es.properties @@ -665,9 +665,7 @@ message.create.template.volume = Por favor, especifique la siguiente informació message.delete.account = Por favor, confirme que desea eliminar esta cuenta. message.detach.iso.confirm = Por favor, confirme que desea quitar el ISO de la instancia virtual message.disable.account = Por favor, confirme que desea deshabilitar esta cuenta. Al deshabilitar la cuenta, todos los usuarios de esta cuenta ya no tienen acceso a los recursos de su nube. Todas las máquinas virtuales en ejecución se cierre inmediatamente. -message.disable.vpn.access = Por favor, confirme que desea desactivar VPN de acceso. -message.download.ISO = Por favor, haga clic # para descargar la ISO -message.download.template = Por favor, haga clic # para descargar la plantilla +message.disable.vpn.access = Por favor, confirme que desea desactivar VPN de acceso. message.edit.confirm = Por favor confirmar los cambios antes de hacer clic en "Guardar" message.edit.limits = Por favor, especifique los límites de los recursos siguientes. A "-1" indica que no hay límite a la cantidad de los recursos de crear. message.enable.account = Por favor, confirme que desea habilitar esta cuenta. diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties index 003f76299cf..cbc9799c413 100644 --- a/client/WEB-INF/classes/resources/messages_ja.properties +++ b/client/WEB-INF/classes/resources/messages_ja.properties @@ -666,8 +666,6 @@ message.delete.account=このアカウントを削除してもよろしいです message.detach.iso.confirm=仮想インスタンスからISOをデタッチしてもよろしいですか? message.disable.account=このアカウントを無効にしてもよろしいですか? アカウントを無効にすることにより、このアカウントのすべてのユーザーはクラウドリソースにアクセスできなくなります。実行中のすべての仮想マシンはすぐにシャットダウンされます。 message.disable.vpn.access=VPNアクセスを無効にしてもよろしいですか? -message.download.ISO=してくださいクリックしてををISO -message.download.templateは=テンプレートをダウンロードするにはクリックのに＃未をしてください message.edit.confirm='保存'をクリックする前に変更内容を確認してください message.edit.limits =以下のリソースへの制限を指定してください。"-1"はリソースの生成に制限がないことを示しています。 message.enable.account=このアカウントを有効にしてもよろしいですか? diff --git a/client/WEB-INF/classes/resources/messages_zh_CN.properties b/client/WEB-INF/classes/resources/messages_zh_CN.properties index c0e8dd3d444..58d04a2fe47 100644 --- a/client/WEB-INF/classes/resources/messages_zh_CN.properties +++ b/client/WEB-INF/classes/resources/messages_zh_CN.properties @@ -7,6 +7,8 @@ label.root.disk.offering=Root磁盘offering label.confirmation=确认 label.alert=警报 label.session.expired=session过期 +message.download.ISO=请点击00000来下载ISO +message.download.template=请点击00000下载模板 #Labels label.account =帐号 @@ -676,8 +678,6 @@ message.delete.account =请确认您要删除该帐户。 message.detach.iso.confirm =请确认您想要从该虚拟机上卸载光盘 message.disable.account =请确认您要禁用此帐户。通过禁用该帐户，该帐户的所有用户将不再能够访问他们的云资源。所有正在运行的虚拟机将被立即关闭。 message.disable.vpn.access =请确认您要禁用VPN访问。 -message.download.ISO=请点击的＃来下载ISO -message.download.template=请点击的＃下载模板 message.edit.confirm =在点击“保存”之前，请先确认您所做的修改 message.edit.limits =请对以下资源指定限额。 “-1”表示对资源的创建没有限制。 message.enable.account =请确认您想要启用该帐户。 diff --git a/ui/scripts/cloud.core.iso.js b/ui/scripts/cloud.core.iso.js index 8a38e7f5480..1f60ac50914 100644 --- a/ui/scripts/cloud.core.iso.js +++ b/ui/scripts/cloud.core.iso.js @@ -762,7 +762,7 @@ function doDownloadISO($actionLink, $detailsTab, $midmenuItem1) { $infoContainer.find("#icon,#info").removeClass("error"); var url = decodeURIComponent(json.queryasyncjobresultresponse.jobresult.iso.url); var htmlMsg = dictionary["message.download.ISO"]; - var htmlMsg2 = htmlMsg.replace(/#/g, url); + var htmlMsg2 = htmlMsg.replace(/#/, url).replace(/00000/, url); $infoContainer.find("#info").html(htmlMsg2); $infoContainer.show(); } else if (result.jobstatus == 2) { // Failed diff --git a/ui/scripts/cloud.core.template.js b/ui/scripts/cloud.core.template.js index d8a1d55f59f..91d9a5d4c88 100644 --- a/ui/scripts/cloud.core.template.js +++ b/ui/scripts/cloud.core.template.js @@ -796,7 +796,7 @@ function doDownloadTemplate($actionLink, $detailsTab, $midmenuItem1) { $infoContainer.find("#icon,#info").removeClass("error"); var url = decodeURIComponent(json.queryasyncjobresultresponse.jobresult.template.url); var htmlMsg = dictionary["message.download.template"]; - var htmlMsg2 = htmlMsg.replace(/#/g, url); + var htmlMsg2 = htmlMsg.replace(/#/, url).replace(/00000/, url); $infoContainer.find("#info").html(htmlMsg2); $infoContainer.show(); } else if (result.jobstatus == 2) { // Failed