From 898dfd3ba5288222edc3a0f35bb0ea1fe9a8bafb Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Mon, 21 May 2012 16:07:11 +0200 Subject: [PATCH 1/4] Sunstone: specifying the target attribute in a VM template image is no longer mandatory --- src/sunstone/public/js/plugins/templates-tab.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js index dcf42eb96c..cc7d356361 100644 --- a/src/sunstone/public/js/plugins/templates-tab.js +++ b/src/sunstone/public/js/plugins/templates-tab.js @@ -208,7 +208,7 @@ var create_template_tmpl = '
\ \
'+tr("Type of disk device to emulate: ide, scsi")+'
\
\ -
\ +
\ \ \
'+tr("Device to map image disk. If set, it will overwrite the default device mapping")+'
\ From cb288f39c4aaf973acdbfc7366546eeef05bd43f Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Mon, 21 May 2012 16:16:59 +0200 Subject: [PATCH 2/4] Sunstone: fix image select generation for translated states --- src/sunstone/public/js/plugins/templates-tab.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js index cc7d356361..b31a66accd 100644 --- a/src/sunstone/public/js/plugins/templates-tab.js +++ b/src/sunstone/public/js/plugins/templates-tab.js @@ -1999,7 +1999,7 @@ function popUpCreateTemplateDialog(){ 4, //id col - trick -> reference by name! 4, //name col [10,10,10], - ["DISABLED","LOCKED","ERROR"] + [tr("DISABLED"),tr("LOCKED"),tr("ERROR")] ); $('div#disks select#IMAGE',$create_template_dialog).html(im_sel); //Repopulate network select From c959a8f3e4f499ba1a7ed3e74a787006a058550d Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Mon, 21 May 2012 16:25:56 +0200 Subject: [PATCH 3/4] Sunstone: fix some strings --- src/sunstone/public/js/plugins/templates-tab.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js index b31a66accd..22171adb2f 100644 --- a/src/sunstone/public/js/plugins/templates-tab.js +++ b/src/sunstone/public/js/plugins/templates-tab.js @@ -336,7 +336,7 @@ var create_template_tmpl = '
\
'+tr("Hardware that will emulate this network interface. With Xen this is the type attribute of the vif.")+'
\
\
\ - \ + \ \
'+tr("Permits access to the VM only through the specified ports in the TCP protocol")+'
\
\
\ - \ + \ \
'+tr("Disallow access to the VM through the specified ports in the TCP protocol")+'
\
\
\ - \ + \ \
'+tr("Permits access to the VM only through the specified ports in the UDP protocol")+'
\
\
\ - \ + \ \
'+tr("Disallow access to the VM through the specified ports in the UDP protocol")+'
\
\
\ - \ + \