diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-03-13 13:47:27 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-03-13 13:47:27 +0100 |
| commit | 4ee7a67789a322a9ed85779c2d93cc3348db5a3c (patch) | |
| tree | 0680f7aa5d4ac7c8ff7713f411d05030765e942b /addons/web/static/src | |
| parent | 431380c6e1776712189beba65ff2d92e84ee43b1 (diff) | |
| parent | 408144864b8a01246729657aa6b096f83dae7c88 (diff) | |
[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
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 57b528e7ecf..a0eb3968944 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -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() { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 809e7d2bcb1..970659dfa43 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -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> |