diff options
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> |