diff options
| author | Gery Debongnie <ged@openerp.com> | 2014-03-17 16:27:10 +0100 |
|---|---|---|
| committer | Gery Debongnie <ged@openerp.com> | 2014-03-17 16:27:10 +0100 |
| commit | e8198d74b68c3f1fba677b596a2eedf60af8ad83 (patch) | |
| tree | e0d5f932dbc753f371b2aecdc37f9001ebae06bc /addons/web/static/src/xml | |
| parent | af61fd53bc86583aca872d4d884e976fed885d30 (diff) | |
[IMP] various tweaks to stat_button, to fix issues mentioned in code review. This is mostly cosmetic cleanups, only notable change is that stat_button is now a proper html button instead of a label (addon web)
bzr revid: ged@openerp.com-20140317152710-c33q8kua33o001la
Diffstat (limited to 'addons/web/static/src/xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index b24bd8642cc..cc56dc2de13 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1189,7 +1189,7 @@ </span> </t> <t t-name="FieldPercentPie"> - <span id="prout" class="oe_form_field oe_form_field_percent_pie" t-att-style="widget.node.attrs.style"> + <span class="oe_form_field oe_form_field_percent_pie" t-att-style="widget.node.attrs.style"> <svg></svg> </span> </t> @@ -1356,26 +1356,15 @@ </div> </t> <t t-name="WidgetButton"> - <t t-if="!widget.is_stat_button"> - <button type="button" class="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> - </button> - </t> - <t t-if="widget.is_stat_button"> - <label type="button" class="oe_stat_button btn btn-default" - 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"> - <t t-if="widget.icon"><div class="stat_button_icon"><t t-raw="widget.icon"/></div></t> - <span t-if="widget.string"><t t-esc="widget.string"/></span> - </label> - </t> + <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.is_stat_button and widget.node.attrs.icon " t-att-src="_s + widget.node.attrs.icon" width="16" height="16"/> + <t t-if="widget.is_stat_button and widget.icon"><div class="stat_button_icon"><t t-raw="widget.icon"/></div></t> + <span t-if="widget.string"><t t-esc="widget.string"/></span> + </button> </t> <t t-name="WidgetButton.tooltip" t-extend="WidgetLabel.tooltip"> <t t-jquery="div.oe_tooltip_string" t-operation="replace"> |