diff options
| author | Christophe Simonis <chs@openerp.com> | 2011-12-13 17:27:30 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2011-12-13 17:27:30 +0100 |
| commit | 2a492cf3add2ef41dcd911feb4cb2c1af9049491 (patch) | |
| tree | 425978ee4d71b95a179a41663329e050cf5b8b2a /addons/web/static/src/xml | |
| parent | bb852a7d94f33529ebc5f3853174deb4557c1e71 (diff) | |
[FIX] chs stupidity
bzr revid: chs@openerp.com-20111213162730-w1p543ctjzpuf7f7
Diffstat (limited to 'addons/web/static/src/xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index f42d173a5bc..0a245fe0f38 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -928,12 +928,7 @@ t-att-id="widget.element_id" t-attf-class="field_#{widget.type}" style="width: 100%" -<<<<<<< TREE - ></textarea> - <img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='widget.session.server + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/> -======= - ></textarea><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" src="/web/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/> ->>>>>>> MERGE-SOURCE + ></textarea><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='widget.session.server + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/> </t> <t t-name="web.datetimepicker"> <div class="oe_datepicker_root"> @@ -941,12 +936,7 @@ <input type="text" size="1" style="width: 100%" t-att-name="widget.name" t-attf-class="oe_datepicker_master field_#{widget.type_of_date}" -<<<<<<< TREE - /> - <img class="oe_input_icon oe_datepicker_trigger" t-att-src='widget.session.server + "/web/static/src/img/ui/field_calendar.png"' -======= - /><img class="oe_input_icon oe_datepicker_trigger" src="/web/static/src/img/ui/field_calendar.png" ->>>>>>> MERGE-SOURCE + /><img class="oe_input_icon oe_datepicker_trigger" t-att-src='widget.session.server + "/web/static/src/img/ui/field_calendar.png"' title="Select date" width="16" height="16" border="0"/> </div> </t> |