[FIX] FieldMany2ManyBinaryMultiFiles: use the field string instead of an hardcoded 'File' as name after the uploader icon

[FIX] FieldTextHtml: fixed quote error in parameter of cleditor, leading to font-family not taken into account.

bzr revid: tde@openerp.com-20130313124727-q6cyn7tzqsiuus3q
This commit is contained in:
Thibault Delavallée
2013-03-13 13:47:27 +01:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -2663,7 +2663,7 @@ instance.web.form.FieldTextHtml = instance.web.form.AbstractField.extend(instanc
"| removeformat | bullets numbering | outdent " +
"indent | link unlink | source",
bodyStyle: // style to assign to document body contained within the editor
"margin:4px; color:#4c4c4c; font-size:13px; font-family:\"Lucida Grande\",Helvetica,Verdana,Arial,sans-serif; cursor:text"
"margin:4px; color:#4c4c4c; font-size:13px; font-family:'Lucida Grande',Helvetica,Verdana,Arial,sans-serif; cursor:text"
});
this.$cleditor = this.$textarea.cleditor()[0];
this.$cleditor.change(function() {
+1 -1
View File
@@ -1321,7 +1321,7 @@
<div class="oe_add" t-if="!widget.get('effective_readonly')">
<!-- uploader of file -->
<button class="oe_attach"><span class="oe_e">'</span></button>
<span class='oe_attach_label'>File</span>
<span class='oe_attach_label'><t t-esc="widget.string"/></span>
<t t-call="HiddenInputFile">
<t t-set="fileupload_id" t-value="widget.fileupload_id"/>
<t t-set="fileupload_action" t-translation="off">/web/binary/upload_attachment</t>