diff options
| author | Aaron Bohy <aab@odoo.com> | 2015-08-03 14:39:19 +0200 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2015-08-04 12:16:17 +0200 |
| commit | 37f5875ea5d11257e6abfb0a3de42ad19d57a3d3 (patch) | |
| tree | ae22fa471eb2558845b55210903194cbd189ac45 /addons/web/static/src/xml/base.xml | |
| parent | 5ebcc01fda2f102486ac68809655630668e6fd59 (diff) | |
[FIX] web: form_view: WidgetButton
Buttons that are not stat buttons couldn't use font-awesome icons, as it
automatically fallbacked on the icons in /web/static/src/img/icons. This was
the case for several templates where the icon thus couldn't be found as it was
looking for a font-awesome icon in the icons folder (e.g. fa-cog.png).
Also cleans some unused less rules defined on the stat buttons in
enterprise_compatibility.less
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index bd15f4ca605..7998929a371 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1153,10 +1153,11 @@ t-att-tabindex="widget.node.attrs.tabindex" t-att-autofocus="widget.node.attrs.autofocus" t-att-accesskey="widget.node.attrs.accesskey"> - <img t-if="!widget.is_stat_button and widget.node.attrs.icon " t-att-src="_s + widget.node.attrs.icon" width="16" height="16"/> - <div t-if="widget.is_stat_button and widget.icon_class" t-att-class="widget.icon_class"></div> - <span t-if="widget.string and !widget.is_stat_button"><t t-esc="widget.string"/></span> - <div t-if="widget.string and widget.is_stat_button" class="o_stat_info"><t t-esc="widget.string"/></div> + <t t-if="widget.node.attrs.icon"> + <img t-if="!widget.fa_icon" t-att-src="widget.node.attrs.icon"/> + <div t-if="widget.fa_icon" t-attf-class="fa fa-fw #{widget.node.attrs.icon} o_button_icon"/> + </t> + <span t-if="widget.string"><t t-esc="widget.string"/></span> </button> </t> <t t-name="WidgetButton.tooltip" t-extend="WidgetLabel.tooltip"> |