diff options
| author | niv-openerp <nicolas.vanhoren@openerp.com> | 2012-05-09 14:58:54 +0200 |
|---|---|---|
| committer | niv-openerp <nicolas.vanhoren@openerp.com> | 2012-05-09 14:58:54 +0200 |
| commit | 3abc0d0999bbce7703e98cff207e82094e6e747d (patch) | |
| tree | 80cb8c1eeaa5fd94c57f9cb4d19f5275172199d3 /addons/web/static/src/xml | |
| parent | 56cf93e993a9042d3063e8668edb25081aad4ad4 (diff) | |
| parent | e4fdf1b061b7cc859e3d257dcab504caf8e8ebf2 (diff) | |
[merge]
bzr revid: nicolas.vanhoren@openerp.com-20120509125854-017vc8d5q976fagp
Diffstat (limited to 'addons/web/static/src/xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index ee7323248d4..3a24bebf924 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -917,7 +917,7 @@ t-att-tabindex="widget.node.attrs.tabindex" t-att-autofocus="widget.node.attrs.autofocus" t-attf-class="field_char #{widget.is_field_number ? 'oe-number' : ''}" - t-att-placeholder="widget.placeholder" + t-att-placeholder="widget.node.attrs.placeholder" /><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/> </div> </t> @@ -934,6 +934,7 @@ t-att-id="widget.id_for_label" t-att-tabindex="widget.node.attrs.tabindex" t-att-autofocus="widget.node.attrs.autofocus" + t-att-placeholder="widget.node.attrs.placeholder" /> </td> <td width="16"> @@ -959,6 +960,7 @@ t-att-id="widget.id_for_label" t-att-tabindex="widget.node.attrs.tabindex" t-att-autofocus="widget.node.attrs.autofocus" + t-att-placeholder="widget.node.attrs.placeholder" /> </td> <td width="16"> @@ -982,6 +984,7 @@ class="field_text" t-att-tabindex="widget.node.attrs.tabindex" t-att-autofocus="widget.node.attrs.autofocus" + t-att-placeholder="widget.node.attrs.placeholder" ></textarea> <img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/> @@ -992,6 +995,7 @@ <input type="text" class="oe_datepicker_container" disabled="disabled" style="display: none;"/> <input type="text" t-att-name="widget.name" + t-att-placeholder="widget.getParent().node.attrs.placeholder" t-attf-class="oe_datepicker_master field_#{widget.type_of_date} oe_form_field_#{widget.type_of_date}" /><img class="oe_input_icon oe_datepicker_trigger" t-att-src='_s + "/web/static/src/img/ui/field_calendar.png"' title="Select date" width="16" height="16" border="0"/> @@ -1024,6 +1028,7 @@ t-att-id="widget.id_for_label" t-att-tabindex="widget.node.attrs.tabindex" t-att-autofocus="widget.node.attrs.autofocus" + t-att-placeholder="widget.node.attrs.placeholder" /> <span class="oe-m2o-drop-down-button"> <img t-att-src='_s + "/web/static/src/img/down-arrow.png"' /></span> |