diff options
| author | Tejas Tank <tta@openerp.com> | 2012-05-09 19:12:44 +0530 |
|---|---|---|
| committer | Tejas Tank <tta@openerp.com> | 2012-05-09 19:12:44 +0530 |
| commit | 36cb8d087ba0356a1481a042a6b0c2eceae1de4a (patch) | |
| tree | 554646f89cecbc107d7bf44bae15b11c955b483f /addons/web/static/src/xml | |
| parent | 195cb2811dbce3bdbbfd4c470b581c3871fbdbf1 (diff) | |
| parent | e4fdf1b061b7cc859e3d257dcab504caf8e8ebf2 (diff) | |
Merged with latest
bzr revid: tta@openerp.com-20120509134244-1crz49v2ad49m3w5
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 07b41cf1a2e..e6c9a3867f1 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> |