diff options
| author | Turkesh Patel (Open ERP) <tpa@tinyerp.com> | 2012-04-19 15:28:19 +0530 |
|---|---|---|
| committer | Turkesh Patel (Open ERP) <tpa@tinyerp.com> | 2012-04-19 15:28:19 +0530 |
| commit | 6589bfeb81c1346af3383688c404fd2c245cb3ac (patch) | |
| tree | 7c9fa004eedd8af94c4232923a44bbb1e0303e91 /addons/web/static/src/xml/base.xml | |
| parent | 217cf2e14bdb78f77138872b8f9ea0ba0baff050 (diff) | |
| parent | ac8646d3223bfa052cbb81d94fe1076f58b50f8c (diff) | |
[MRG] merge with main branch.
bzr revid: tpa@tinyerp.com-20120419095819-o07ywcs2qnx6s4tm
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 3291aef0398..b47c8d01684 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -324,7 +324,7 @@ </ul> </t> <t t-name="Menu.secondary.link"> - <a href="#" + <a t-attf-href="#menu_id=#{menu.id}&action_id=#{menu.action ? menu.action.split(',')[1] : ''}" t-att-class="menu.children.length ? 'oe_menu_toggler' : 'oe_menu_leaf'" t-att-data-menu="menu.id" t-att-data-action-model="menu.action ? menu.action.split(',')[0] : ''" @@ -972,16 +972,16 @@ </t> </t> <t t-name="FieldText"> - <t t-if="!widget.get('effective_readonly')"> - <div class="oe_form_field_text"> - <textarea rows="6" - t-att-name="widget.name" - class="field_text" - t-att-tabindex="widget.node.attrs.tabindex" - t-att-autofocus="widget.node.attrs.autofocus" - ></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"/> - </div> - </t> + <div class="oe_form_field_text"> + <textarea rows="6" + t-att-name="widget.name" + class="field_text" + t-att-tabindex="widget.node.attrs.tabindex" + t-att-autofocus="widget.node.attrs.autofocus" + ></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"/> + </div> </t> <t t-name="web.datetimepicker"> <div class="oe_datepicker_root oe_form_field_datetime"> |