diff options
| author | Fabien Meghazi <fme@openerp.com> | 2011-05-09 16:10:01 +0200 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2011-05-09 16:10:01 +0200 |
| commit | 93d7852342e9bba2f714160fd6ac5d7833c46f3b (patch) | |
| tree | ee84d593f0af57169fdeebab4b1f94eff4be9c79 /addons/base/static/src | |
| parent | 2e760b3699e6befced31bd16f2672cb41c1644f6 (diff) | |
[ADD] Added percentage in progressbar (can't center it for the moment)
bzr revid: fme@openerp.com-20110509141001-33vihmt5edam0ydq
Diffstat (limited to 'addons/base/static/src')
| -rw-r--r-- | addons/base/static/src/css/base.css | 6 | ||||
| -rw-r--r-- | addons/base/static/src/js/form.js | 8 | ||||
| -rw-r--r-- | addons/base/static/src/xml/base.xml | 4 |
3 files changed, 17 insertions, 1 deletions
diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css index 61ad2bf8286..6656dd42849 100644 --- a/addons/base/static/src/css/base.css +++ b/addons/base/static/src/css/base.css @@ -648,6 +648,12 @@ body.openerp { background-color: #F66; border: 1px solid #D00; } +.openerp div.oe-progressbar span { + position: absolute; + margin-left: 10px; + margin-top: 5px; + font-weight: bold; +} /* jQuery UI override */ .openerp .ui-widget { diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index 3a6ef174c8d..27beadbdecf 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -773,6 +773,14 @@ openerp.base.form.FieldProgressBar = openerp.base.form.Field.extend({ value: this.value, disabled: this.readonly }); + }, + set_value: function(value) { + this._super.apply(this, arguments); + var show_value = Number(value); + if (show_value === NaN) { + show_value = 0; + } + this.$element.find('div').progressbar('option', 'value', show_value).find('span').html(show_value + '%'); } }); diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml index aae0d445a03..8675e59818d 100644 --- a/addons/base/static/src/xml/base.xml +++ b/addons/base/static/src/xml/base.xml @@ -365,7 +365,9 @@ t-att-class="'field_' + widget.type"/> </t> <t t-name="FieldProgressBar"> - <div t-opentag="true"></div> + <div t-opentag="true" class="oe-progressbar"> + <span></span> + </div> </t> <t t-name="WidgetButton"> <button type="button" |