diff options
| author | Xavier Morel <xmo@openerp.com> | 2012-06-25 15:52:15 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2012-06-25 15:52:15 +0200 |
| commit | 54a8f9e1938c6bbc85ad821399eb32c83e8b1dd0 (patch) | |
| tree | cc681bee3ef991925f96af5693f0f21a4126cc9d /addons/web/static/src/xml/base.xml | |
| parent | 4a88fba764e2ec12ddbc2038ccdac8467549864e (diff) | |
| parent | 9029f24d8775a2730882ce6e7d7162f81535e588 (diff) | |
[MERGE] 6.1 changes and trunk
bzr revid: xmo@openerp.com-20120625135215-az1927llmk0vw655
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index e293ffc7adb..e709f56b801 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1411,8 +1411,7 @@ <li> <select class="searchview_extended_prop_field"> <t t-foreach="widget.attrs.fields" t-as="field"> - <option t-if="typeof field.store === 'undefined' || field.store || field.fnct_search" - t-att="{'selected': field === widget.attrs.selected ? 'selected' : null}" + <option t-att="{'selected': field === widget.attrs.selected ? 'selected' : null}" t-att-value="field.name"> <t t-esc="field.string"/> </option> @@ -1495,7 +1494,7 @@ <tr> <td width="16px" t-att-style="'background-position: ' + 20*rec.level + 'px; padding-left: ' + 20*rec.level + 'px'"> <img t-if="rec.child_id.length" t-att-id="'parentimg-' + rec.id" - src="/web/static/src/img/collapse.gif" width="16" height="16" border="0"/> + t-att-src='_s + "/web/static/src/img/collapse.gif"' width="16" height="16" border="0"/> </td> <td style="cursor: pointer;"> <a style="text-decoration:none" href="javascript:void(0);"> @@ -1507,22 +1506,22 @@ </td> <td width="2%"> <img t-if="rec.att_list.length" - id="side-add" src="/web/static/src/img/icons/gtk-add.png" style="cursor: pointer;"/> + id="side-add" t-att-src='_s + "/web/static/src/img/icons/gtk-add.png"' style="cursor: pointer;"/> </td> <td width="2%"> - <img id="side-remove" src="/web/static/src/img/icons/gtk-remove.png" style="cursor: pointer;"/> + <img id="side-remove" t-att-src='_s + "/web/static/src/img/icons/gtk-remove.png"' style="cursor: pointer;"/> </td> <td width="2%"> <img t-if="rec.att_list.length and !_.include(no_properties, rec.att_list[0])" - id="side-edit" src="/web/static/src/img/icons/gtk-edit.png" style="cursor: pointer;"/> + id="side-edit" t-att-src='_s + "/web/static/src/img/icons/gtk-edit.png"' style="cursor: pointer;"/> </td> <td width="2%"> <img t-if="rec.att_list.length" - id="side-up" src="/web/static/src/img/icons/gtk-go-up.png" style="cursor: pointer;"/> + id="side-up" t-att-src='_s + "/web/static/src/img/icons/gtk-go-up.png"' style="cursor: pointer;"/> </td> <td width="2%"> <img t-if="rec.att_list.length" - id="side-down" src="/web/static/src/img/icons/gtk-go-down.png" style="cursor: pointer;"/> + id="side-down" t-att-src='_s + "/web/static/src/img/icons/gtk-go-down.png"' style="cursor: pointer;"/> </td> <t t-if="rec.child_id.length"> <t t-set="data" t-value="rec.child_id"/> @@ -1546,7 +1545,6 @@ <t t-name="vieweditor_boolean"> <input type="checkbox" t-att-id="widget.name"/> </t> - <t t-name="ExportView"> <a id="exportview" href="javascript: void(0)" style="text-decoration: none;color: #3D3D3D;">Export</a> </t> |