odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] chs stupidity 

bzr revid: chs@openerp.com-20111213162730-w1p543ctjzpuf7f7
This commit is contained in:
Christophe Simonis 2011-12-13 17:27:30 +01:00
parent bb852a7d94
commit 2a492cf3ad
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/web/static/src/xml/base.xml
View File

@ -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>