diff options
| author | Gery Debongnie <ged@openerp.com> | 2014-05-02 16:52:11 +0200 |
|---|---|---|
| committer | Gery Debongnie <ged@openerp.com> | 2014-05-02 16:52:11 +0200 |
| commit | 8fbebfd752fa8933584711522675d354b3217839 (patch) | |
| tree | d8b56b8669717b0964030562cff553795b668d16 /addons/web/static/src/xml/base.xml | |
| parent | c9e7635859614f3446cb81c620b17517262da8a8 (diff) | |
| parent | 132ccb71807ea24ff2731f4300ea610ca71731da (diff) | |
[MERGE] merge the last changes to improve the 'stat buttons' support in web
Many small tweaks/css changes to correctly display the stat buttons in
various situations (with/without icons, with/without strings, with sub
widgets, ...)
bzr revid: ged@openerp.com-20140502145211-ehnb1v66szw7nl01
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index f7a4c5cb295..18a55656df2 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1408,7 +1408,7 @@ 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="stat_button_icon"><t t-raw="widget.icon"/></div> + <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"><t t-esc="widget.string"/></div> </button> @@ -1985,6 +1985,5 @@ <a href="javascript:void(0)"><t t-esc="text"/></a> </t> <t t-name="StatInfo"> - <strong><t t-esc="value"/></strong> - <t t-esc="text"/></t> + <strong><t t-esc="value"/></strong><br/><t t-esc="text"/></t> </templates> |