diff options
| author | Antony Lesuisse <al@openerp.com> | 2012-07-26 02:58:35 +0200 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2012-07-26 02:58:35 +0200 |
| commit | 3a6f429d0d7cf2b59f1b61830662f747002b93bd (patch) | |
| tree | 4eaa84af7a2b7e827680f07436c0fb99c79ebf08 /addons/web/static/src | |
| parent | 3a793019b66dc5e246f19151003fbd70d02c98d3 (diff) | |
[FIX] support arbitrary icons
bzr revid: al@openerp.com-20120726005835-g1l6kg8yge225fd8
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 3 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 5f12c82167e..5f73f34e723 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -1654,6 +1654,9 @@ instance.web.form.WidgetButton = instance.web.form.FormWidget.extend({ // TODO fme: provide enter key binding to widgets this.view.default_focus_button = this; } + if (this.node.attrs.icon && (! /\//.test(this.node.attrs.icon))) { + this.node.attrs.icon = '/web/static/src/img/icons/' + this.node.attrs.icon + '.png'; + } this.view.on('view_content_has_changed', this, this.check_disable); }, start: function() { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 4ce36fe86d4..2cbda972719 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1133,7 +1133,7 @@ t-att-style="widget.node.attrs.style" t-att-tabindex="widget.node.attrs.tabindex" t-att-autofocus="widget.node.attrs.autofocus"> - <img t-if="widget.node.attrs.icon" t-att-src="_s + '/web/static/src/img/icons/' + widget.node.attrs.icon + '.png'" width="16" height="16"/> + <img t-if="widget.node.attrs.icon" t-att-src="_s + widget.node.attrs.icon" width="16" height="16"/> <span t-if="widget.string"><t t-esc="widget.string"/></span> </button> </t> |