<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<meta name="Generator" content="Microsoft Word 15 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Times New Roman",serif;
color:black;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
p
{mso-style-priority:99;
mso-margin-top-alt:auto;
margin-right:0cm;
mso-margin-bottom-alt:auto;
margin-left:0cm;
font-size:12.0pt;
font-family:"Times New Roman",serif;
color:black;}
span.EmailStyle18
{mso-style-type:personal-reply;
font-family:"Calibri",sans-serif;
color:#1F497D;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:70.85pt 3.0cm 70.85pt 3.0cm;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body bgcolor="white" lang="PT-BR" link="blue" vlink="purple">
<div class="WordSection1">
<p class="MsoNormal"><span lang="EN-US" style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D;mso-fareast-language:EN-US">I have to investigate this but I think there isn’t much to be done unless we use a different font for Ubuntu. For now
I think we can copy the default style for <abbr> and <acronym> tags:<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US" style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D;mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span lang="EN-US" style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D;mso-fareast-language:EN-US">border-bottom: 1px dotted;<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US" style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D;mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span lang="EN-US" style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D;mso-fareast-language:EN-US">Samuel<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US" style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D;mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<div>
<div style="border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0cm 0cm 0cm">
<p class="MsoNormal"><b><span lang="EN-US" style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:windowtext">From:</span></b><span lang="EN-US" style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:windowtext"> kimchi-devel-bounces@ovirt.org
[mailto:kimchi-devel-bounces@ovirt.org] <b>On Behalf Of </b>Socorro Stoppler<br>
<b>Sent:</b> segunda-feira, 29 de agosto de 2016 18:56<br>
<b>To:</b> Aline Manera <alinefm@linux.vnet.ibm.com>; Kimchi Devel <kimchi-devel@ovirt.org><br>
<b>Subject:</b> Re: [Kimchi-devel] [PATCHv2] [Kimchi] Issue# 973 Display resource name in confirmation dialog<o:p></o:p></span></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<p>Hi Samuel,<o:p></o:p></p>
<p>Not sure in what cases this doesn't work for, but if it's minimal, is it worth just documenting or as Aline suggested, possibly changing how the resource is being emphasized?<o:p></o:p></p>
<p class="MsoNormal" style="margin-bottom:12.0pt">Thanks<br>
-Socorro<o:p></o:p></p>
<div>
<p class="MsoNormal">On 08/29/2016 11:19 AM, Aline Manera wrote:<o:p></o:p></p>
</div>
<blockquote style="margin-top:5.0pt;margin-bottom:5.0pt">
<p class="MsoNormal" style="margin-bottom:12.0pt"><br>
hmm.. So in that case, which approach to follow?<br>
<br>
Maybe user underline or italic instead of bold? Or any other suggestion?<o:p></o:p></p>
<div>
<p class="MsoNormal">On 08/29/2016 01:46 PM, Socorro Stoppler wrote:<o:p></o:p></p>
</div>
<blockquote style="margin-top:5.0pt;margin-bottom:5.0pt">
<p>I'm also running FF version 48; however I'm on Ubuntu 16.04. <o:p></o:p></p>
<p>Per Samuel's email from this morning: <o:p></o:p></p>
<p>I believe this is a problem with Open Sans in some distros. I noticed that in some cases mainly with Firefox some styles with font weight set to 600 won't work and 700 is usually too bold to set as fallback.<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<p class="MsoNormal">On 08/29/2016 09:30 AM, Aline Manera wrote:<o:p></o:p></p>
</div>
<blockquote style="margin-top:5.0pt;margin-bottom:5.0pt">
<p class="MsoNormal" style="margin-bottom:12.0pt"><br>
Hi Socorro,<br>
<br>
I tried to delete a VM and a Template and none of the confirmation boxes showed the resource name in bold.<br>
I am on Firefox 48 as you can see below:<br>
<br>
<br>
<br>
<br>
<br>
<br>
Regards,<br>
Aline Manera<o:p></o:p></p>
<div>
<p class="MsoNormal">On 08/27/2016 02:10 AM, Socorro Stoppler wrote:<o:p></o:p></p>
</div>
<blockquote style="margin-top:5.0pt;margin-bottom:5.0pt">
<p>Hi Aline,<o:p></o:p></p>
<p>Which did you not see in bold? Here are some of the ones I've tried on FF as well:<o:p></o:p></p>
<p> <o:p></o:p></p>
<p> <o:p></o:p></p>
<p>Thanks<o:p></o:p></p>
<p>-Socorro<o:p></o:p></p>
<div>
<p class="MsoNormal">On 08/26/2016 07:57 AM, Aline Manera wrote:<o:p></o:p></p>
</div>
<blockquote style="margin-top:5.0pt;margin-bottom:5.0pt">
<p class="MsoNormal"><br>
Hi Socorro, <br>
<br>
I tested on Firefox and the resource name did not show up in bold. It is on normal font width.
<br>
<br>
Could you verify that, please? <br>
<br>
Regards, <br>
Aline Manera <br>
<br>
On 08/22/2016 03:28 PM, Socorro Stoppler wrote: <br>
<br>
<o:p></o:p></p>
<blockquote style="margin-top:5.0pt;margin-bottom:5.0pt">
<p class="MsoNormal">From: Socorro <a href="mailto:socorro@linux.vnet.ibm.com"><socorro@linux.vnet.ibm.com></a>
<br>
<br>
v2: <br>
Display resource name (with name in bold) in confirmation dialog <br>
<br>
v1: <br>
When confirmation dialogs are shown, also display the name of the resource being <br>
acted on (i.e. guest name, network, storage, template) as part of the message. <br>
<br>
Signed-off-by: Socorro <a href="mailto:socorro@linux.vnet.ibm.com"><socorro@linux.vnet.ibm.com></a>
<br>
--- <br>
ui/js/src/kimchi.guest_main.js | 16 +++++++++++----- <br>
ui/js/src/kimchi.network.js | 6 ++++-- <br>
ui/js/src/kimchi.storage_main.js | 8 +++++--- <br>
ui/js/src/kimchi.template_main.js | 5 +++-- <br>
ui/pages/i18n.json.tmpl | 20 ++++++++++---------- <br>
5 files changed, 33 insertions(+), 22 deletions(-) <br>
<br>
diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js <br>
index 9c1aa54..696cf8f 100644 <br>
--- a/ui/js/src/kimchi.guest_main.js <br>
+++ b/ui/js/src/kimchi.guest_main.js <br>
@@ -127,8 +127,10 @@ kimchi.vmpoweroff = function(event) { <br>
var vm_id = vm.attr("id"); <br>
var vmObject = vm.data(); <br>
var vm_persistent = vmObject.persistent == true; <br>
- var content_msg = vm_persistent ? i18n['KCHVM6003M'] : <br>
- i18n['KCHVM6009M']; <br>
+ var content_msg_1 = i18n['KCHVM6003M'].replace('%1', '<strong>'+vm_id+'</strong>');
<br>
+ var content_msg_2 = i18n['KCHVM6009M'].replace('%1', '<strong>'+vm_id+'</strong>');
<br>
+ var content_msg = vm_persistent ? content_msg_1 : <br>
+ content_msg_2; <br>
var settings = { <br>
title: i18n['KCHVM6002M'], <br>
content: content_msg, <br>
@@ -153,9 +155,10 @@ kimchi.vmshutdown = function(event) { <br>
var button = event.target; <br>
var vm = $(button).closest('li[name=guest]'); <br>
var vm_id = vm.attr("id"); <br>
+ var confirmMessage = i18n['KCHVM6007M'].replace('%1', '<strong>'+vm_id+'</strong>');
<br>
var settings = { <br>
title: i18n['KCHVM6006M'], <br>
- content: i18n['KCHVM6007M'], <br>
+ content: confirmMessage, <br>
confirm: i18n['KCHAPI6002M'], <br>
cancel: i18n['KCHAPI6003M'] <br>
}; <br>
@@ -174,9 +177,10 @@ kimchi.vmreset = function(event) { <br>
$(button).addClass('loading'); <br>
var vm = $(button).closest('li[name=guest]'); <br>
var vm_id = $(vm).attr("id"); <br>
+ var confirmMessage = i18n['KCHVM6005M'].replace('%1', '<strong>'+vm_id+'</strong>');
<br>
var settings = { <br>
title: i18n['KCHVM6004M'], <br>
- content: i18n['KCHVM6005M'], <br>
+ content: confirmMessage, <br>
confirm: i18n['KCHAPI6002M'], <br>
cancel: i18n['KCHAPI6003M'] <br>
}; <br>
@@ -204,9 +208,11 @@ kimchi.vmdelete = function(event) { <br>
var button = event.target; <br>
var vm = $(button).closest('li[name=guest]'); <br>
var vm_id = $(vm).attr("id"); <br>
+ var confirmMessage = i18n['KCHVM6001M'].replace('%1', '<strong>'+vm_id+'</strong>');
<br>
+ <br>
var settings = { <br>
title: i18n['KCHVM6008M'], <br>
- content: i18n['KCHVM6001M'], <br>
+ content: confirmMessage, <br>
confirm: i18n['KCHAPI6002M'], <br>
cancel: i18n['KCHAPI6003M'] <br>
}; <br>
diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js <br>
index ac6bf74..7ce5b28 100644 <br>
--- a/ui/js/src/kimchi.network.js <br>
+++ b/ui/js/src/kimchi.network.js <br>
@@ -161,9 +161,10 @@ kimchi.addNetworkActions = function(network) { <br>
return false; <br>
} <br>
if (!network.persistent) { <br>
+ var confirmMessage = i18n['KCHNET6004M'].replace('%1', '<strong>'+network.name+'</strong>');
<br>
var settings = { <br>
title : i18n['KCHAPI6001M'], <br>
- content : i18n['KCHNET6004M'], <br>
+ content : confirmMessage, <br>
confirm : i18n['KCHAPI6002M'], <br>
cancel : i18n['KCHAPI6003M'] <br>
}; <br>
@@ -180,9 +181,10 @@ kimchi.addNetworkActions = function(network) { <br>
if (network.state === "up" || network.in_use) { <br>
return false; <br>
} <br>
+ var confirmMessage = i18n['KCHNET6002M'].replace('%1', '<strong>'+network.name+'</strong>');
<br>
wok.confirm({ <br>
title : i18n['KCHAPI6006M'], <br>
- content : i18n['KCHNET6002M'], <br>
+ content : confirmMessage, <br>
confirm : i18n['KCHAPI6002M'], <br>
cancel : i18n['KCHAPI6003M'] <br>
}, function() { <br>
diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js <br>
index 6c99f93..18e6eea 100644 <br>
--- a/ui/js/src/kimchi.storage_main.js <br>
+++ b/ui/js/src/kimchi.storage_main.js <br>
@@ -310,14 +310,15 @@ kimchi.storageBindClick = function() { <br>
$('.pool-delete').on('click', function(event) { <br>
event.preventDefault(); <br>
var $pool = $(this); <br>
+ var poolName = $pool.data('name'); <br>
+ var confirmMessage = i18n['KCHPOOL6001M'].replace('%1', '<strong>'+poolName+'</strong>');
<br>
var settings = { <br>
title : i18n['KCHAPI6001M'], <br>
- content : i18n['KCHPOOL6001M'], <br>
+ content : confirmMessage, <br>
confirm : i18n['KCHAPI6002M'], <br>
cancel : i18n['KCHAPI6003M'] <br>
}; <br>
wok.confirm(settings, function() { <br>
- var poolName = $pool.data('name'); <br>
kimchi.deleteStoragePool(poolName, function() { <br>
kimchi.doListStoragePools(); <br>
}, function(err) { <br>
@@ -339,9 +340,10 @@ kimchi.storageBindClick = function() { <br>
$('.pool-deactivate').on('click', function(event) { <br>
event.preventDefault(); <br>
var poolName = $(this).data('name'); <br>
+ var confirmMessage = i18n['KCHPOOL6012M'].replace('%1', '<strong>'+poolName+'</strong>');
<br>
var settings = { <br>
title : i18n['KCHAPI6001M'], <br>
- content : i18n['KCHPOOL6012M'], <br>
+ content : confirmMessage, <br>
confirm : i18n['KCHAPI6002M'], <br>
cancel : i18n['KCHAPI6003M'] <br>
}; <br>
diff --git a/ui/js/src/kimchi.template_main.js b/ui/js/src/kimchi.template_main.js
<br>
index 302d906..cf98a7b 100644 <br>
--- a/ui/js/src/kimchi.template_main.js <br>
+++ b/ui/js/src/kimchi.template_main.js <br>
@@ -124,14 +124,15 @@ kimchi.templateBindClick = function() { <br>
$('.template-delete a').on('click', function(event) { <br>
event.preventDefault(); <br>
var $template = $(this); <br>
+ var templateName = $template.data('template'); <br>
+ var confirmMessage = i18n['KCHTMPL6003M'].replace('%1', '<strong>'+templateName+'</strong>');
<br>
var settings = { <br>
title: i18n['KCHAPI6001M'], <br>
- content: i18n['KCHTMPL6003M'], <br>
+ content: confirmMessage, <br>
confirm: i18n['KCHAPI6002M'], <br>
cancel: i18n['KCHAPI6003M'] <br>
}; <br>
wok.confirm(settings, function() { <br>
- var templateName = $template.data('template'); <br>
kimchi.deleteTemplate(templateName, function() { <br>
kimchi.doListTemplates(); <br>
}, function(err) { <br>
diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl <br>
index a5185b1..d29a206 100644 <br>
--- a/ui/pages/i18n.json.tmpl <br>
+++ b/ui/pages/i18n.json.tmpl <br>
@@ -47,24 +47,24 @@ <br>
"KCHTMPL6001W": "$_("No ISO found")", <br>
<br>
"KCHTMPL6002M": "$_("This may take a long time. Do you want to continue?")",
<br>
- "KCHTMPL6003M": "$_("This will permanently delete the template. Would you like to continue?")",
<br>
+ "KCHTMPL6003M": "$_("This will permanently delete the %1 template. Would you like to continue?")",
<br>
"KCHTMPL6004M": "$_("View Table")", <br>
"KCHTMPL6005M": "$_("View Gallery")", <br>
"KCHTMPL6006M": "$_("Not Available")", <br>
"KCHTMPL6007M": "$_("Please check the invalid Storage Pools")", <br>
<br>
- "KCHVM6001M": "$_("This will delete the virtual machine and its virtual disks. This operation cannot be undone. Would you like to continue?")",
<br>
+ "KCHVM6001M": "$_("This will delete the %1 virtual machine and its virtual disks. This operation cannot be undone. Would you like to continue?")",
<br>
"KCHVM6002M": "$_("Power off Confirmation")", <br>
"KCHVM6003M": "$_("This action may produce undesirable results, " <br>
- "for example unflushed disk cache in the guest. " <br>
+ "for example unflushed disk cache in the %1 guest. " <br>
"Would you like to continue?")", <br>
"KCHVM6004M": "$_("Reset Confirmation")", <br>
"KCHVM6005M": "$_("There is a risk of data loss caused by reset without" <br>
- " the guest OS shutdown. Would you like to continue?")", <br>
+ " the %1 guest OS shutdown. Would you like to continue?")",
<br>
"KCHVM6006M": "$_("Shut Down Confirmation")", <br>
- "KCHVM6007M": "$_("Note the guest OS may ignore this request. Would you like to continue?")",
<br>
+ "KCHVM6007M": "$_("Note the %1 guest OS may ignore this request. Would you like to continue?")",
<br>
"KCHVM6008M": "$_("Virtual Machine delete Confirmation")", <br>
- "KCHVM6009M": "$_("This virtual machine is not persistent. Power Off will delete it. Continue?")",
<br>
+ "KCHVM6009M": "$_("The %1 virtual machine is not persistent. Power Off will delete it. Continue?")",
<br>
<br>
"KCHVM0001E": "$_("Input is not a number")", <br>
"KCHVM0002E": "$_("Memory value cannot be higher than Max Memory value")", <br>
@@ -89,11 +89,11 @@ <br>
"KCHVMED6012M": "$_("Following devices will be affected, confirm?")", <br>
<br>
"KCHNET6001M": "$_("unavailable")", <br>
- "KCHNET6002M": "$_("This action will interrupt network connectivity for any virtual machine that depend on this network.")",
<br>
- "KCHNET6004M": "$_("This network is not persistent. Instead of stop, this action will permanently delete it. Would you like to continue?")",
<br>
+ "KCHNET6002M": "$_("This action will interrupt network connectivity for any virtual machine that depend on the %1 network.")",
<br>
+ "KCHNET6004M": "$_("The %1 network is not persistent. Instead of stop, this action will permanently delete it. Would you like to continue?")",
<br>
"KCHNET6001W": "$_("The bridged VLAN tag may not work well with NetworkManager enabled. You should consider disabling it.")",
<br>
<br>
- "KCHPOOL6001M": "$_("This will permanently delete the storage pool. Would you like to continue?")",
<br>
+ "KCHPOOL6001M": "$_("This will permanently delete the %1 storage pool. Would you like to continue?")",
<br>
"KCHPOOL6002M": "$_("This storage pool is empty.")", <br>
"KCHPOOL6003M": "$_("It will format your disk and you will loose any data in there, are you sure to continue? ")",
<br>
"KCHPOOL6004M": "$_("SCSI Fibre Channel")", <br>
@@ -108,7 +108,7 @@ <br>
"KCHPOOL6006E": "$_("No logical device selected.")", <br>
"KCHPOOL6009E": "$_("This is not a valid Server Name or IP. Please, modify it.")",
<br>
"KCHPOOL6011M": "$_("No available partitions found.")", <br>
- "KCHPOOL6012M": "$_("This storage pool is not persistent. Instead of deactivate, this action will permanently delete it. Would you like to continue?")",
<br>
+ "KCHPOOL6012M": "$_("The %1 storage pool is not persistent. Instead of deactivate, this action will permanently delete it. Would you like to continue?")",
<br>
"KCHPOOL6013M": "$_("Unable to retrieve partitions information.")", <br>
"KCHPOOL6014M": "$_("In progress...")", <br>
"KCHPOOL6015M": "$_("Failed!")", <o:p></o:p></p>
</blockquote>
<p class="MsoNormal"><o:p> </o:p></p>
</blockquote>
<p class="MsoNormal"><o:p> </o:p></p>
</blockquote>
<p class="MsoNormal"><o:p> </o:p></p>
</blockquote>
<p class="MsoNormal"><o:p> </o:p></p>
</blockquote>
<p class="MsoNormal"><o:p> </o:p></p>
</blockquote>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
</body>
</html>