diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-05-24 13:19:19 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-05-24 13:19:19 +0200 |
| commit | fac4cc7006e5d72a5f6ee261e8a7422c78f5e6fb (patch) | |
| tree | facc8cb60bcd0f1d0536f6f004d05aefcf444fc7 /addons/web/static/src | |
| parent | facb6644839c2120296e0845b8f780cb9998e34e (diff) | |
| parent | f8e6bb73b3aed541fd96e28ec0382ea9964a1db7 (diff) | |
[MERGE] forward port of branch saas-9 up to f8e6bb7
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/views/graph_widget.js | 6 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/addons/web/static/src/js/views/graph_widget.js b/addons/web/static/src/js/views/graph_widget.js index a86ea35e449..e458cc483ed 100644 --- a/addons/web/static/src/js/views/graph_widget.js +++ b/addons/web/static/src/js/views/graph_widget.js @@ -162,7 +162,9 @@ return Widget.extend({ svg.transition().duration(0); var chart = nv.models.multiBarChart(); + var maxVal = _.max(values, function(v) {return v.y}) chart.options({ + margin: {left: 12 * String(maxVal && maxVal.y || 0).length}, delay: 250, transition: 10, showLegend: _.size(data) <= MAX_LEGEND_LENGTH, @@ -292,8 +294,9 @@ return Widget.extend({ svg.transition().duration(0); var chart = nv.models.lineChart(); + var maxVal = _.max(values, function(v) {return v.y}) chart.options({ - margin: {left: 50, right: 50}, + margin: {left: 12 * String(maxVal && maxVal.y || 0).length, right: 50}, useInteractiveGuideline: true, showLegend: _.size(data) <= MAX_LEGEND_LENGTH, showXAxis: true, @@ -301,6 +304,7 @@ return Widget.extend({ }); chart.xAxis.tickValues(tickValues) .tickFormat(tickFormat); + chart.yAxis.tickFormat(function(d) { return openerp.web.format_value(d, { type : 'float' });}); chart(svg); this.to_remove = chart.update; diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index c3670c9aa56..726c30e43fa 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1060,7 +1060,7 @@ <t t-raw="file.name || file.filename"/> </span> <t t-if="(!file.upload or file.percent_loaded>=100)"> - <a class="o_image" t-att-href="file.url" t-attf-title="#{(file.name || file.filename) + (file.date?' \n('+file.date+')':'' )}" t-att-data-mimetype="file.mimetype" t-attf-data-src="/web/image/#{file.id}/100x80"> + <a class="o_image" target="_blank" t-att-href="file.url" t-attf-title="#{(file.name || file.filename) + (file.date?' \n('+file.date+')':'' )}" t-att-data-mimetype="file.mimetype" t-attf-data-src="/web/image/#{file.id}/100x80"> <t t-raw="file.name || file.filename"/> </a> <span class="fa fa-stack oe_delete" title="Delete this file" t-attf-data-id="#{file.id}"> @@ -1075,7 +1075,7 @@ <t t-foreach="widget.get('value')" t-as="id"> <t t-set="file" t-value="widget.data[id]"/> <div> - <a t-att-href="file.url" t-attf-title="#{(file.name || file.filename) + (file.date?' \n('+file.date+')':'' )}"> + <a target="_blank" t-att-href="file.url" t-attf-title="#{(file.name || file.filename) + (file.date?' \n('+file.date+')':'' )}"> <t t-raw="file.name || file.filename"/> </a> </div> |