diff options
| author | Xavier Morel <xmo@openerp.com> | 2014-04-02 11:42:43 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2014-04-02 11:42:43 +0200 |
| commit | d9b9894c62f3bed2b0e88a0bc495a3b4e7fe3ae3 (patch) | |
| tree | 786d83d96dddcef06e76d464d22724cd4dd0a37e /addons/web/static/src/xml | |
| parent | 6a9379429cea71120c9422596c5dfa0a794e2acb (diff) | |
| parent | 4afeee59d10485b84740faf4182678a733f24b03 (diff) | |
[FIX] ged's fp-style merge
bzr revid: xmo@openerp.com-20140402094243-63p5lbcmx8h9ih3b
Diffstat (limited to 'addons/web/static/src/xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 7ba06b69095..23cad2098dc 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1195,6 +1195,11 @@ <span></span> </span> </t> +<t t-name="FieldPercentPie"> + <span class="oe_form_field oe_form_field_percent_pie" t-att-style="widget.node.attrs.style"> + <svg></svg> + </span> +</t> <t t-name="FieldStatus"> <ul t-att-class="'oe_form_field_status ' + (widget.options.clickable ? 'oe_form_status_clickable' : 'oe_form_status')" t-att-style="widget.node.attrs.style"/> </t> @@ -1358,13 +1363,15 @@ </div> </t> <t t-name="WidgetButton"> - <button type="button" class="oe_button oe_form_button" + <button type="button" t-att-class="widget.is_stat_button ? 'oe_stat_button btn btn-default' : 'oe_button oe_form_button'" t-att-style="widget.node.attrs.style" 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.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> + <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" class="stat_button_icon"><t t-if="widget.icon" t-raw="widget.icon"/></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> </t> <t t-name="WidgetButton.tooltip" t-extend="WidgetLabel.tooltip"> @@ -1937,4 +1944,6 @@ <t t-name="X2ManyCounter"> <a href="javascript:void(0)"><t t-esc="text"/></a> </t> +<t t-name="StatInfo"> + <strong><t t-esc="value"/></strong><br/><t t-esc="text"/></t> </templates> |