diff options
| author | Barad Mahendra <mba@tinyerp.com> | 2014-03-18 14:50:12 +0530 |
|---|---|---|
| committer | Barad Mahendra <mba@tinyerp.com> | 2014-03-18 14:50:12 +0530 |
| commit | 955f6c4cd7a73777646bd205ab2bc9799148dff0 (patch) | |
| tree | a35475aaef9b129aa432bd21aa945c7f624e4585 /addons/web/static/src | |
| parent | 90a3059c4e017b3644d6361292900927ba2caf2c (diff) | |
[IMP]improve dropdown
bzr revid: mba@tinyerp.com-20140318092012-4ch33v0e4ej88t2z
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/css/base.css | 1 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 1 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 6 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 11 |
4 files changed, 12 insertions, 7 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 69ca592298c..7e615c56a5e 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3435,6 +3435,7 @@ body.oe_single_form .oe_single_form_container { background: white; background: white !important; min-width: 100%; + padding-right: 9px !important; } .dropdown-menu.state li a, .dropdown-menu.state li a:hover, .dropdown-menu.state li a:focus { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 384bbcc3638..b034206c926 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2775,6 +2775,7 @@ body.oe_single_form background: white background: white !important min-width: 100% + padding-right: 10px !important .dropdown-menu.state li a, .dropdown-menu.state li a:hover, .dropdown-menu.state li a:focus text-decoration: none color: #333 diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index eb92a86dbd1..c9344ae137e 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2337,9 +2337,9 @@ instance.web.form.DropdownSelection = instance.web.form.FieldChar.extend({ this._super(field_manager, node); }, prepare_dropdown_selection: function() { - return [{ 'name': 'normal', 'state_name': ' In Progress', 'state_class': 'btn-default' }, - { 'name': 'blocked', 'state_name': ' Blocked', 'state_class': 'btn-danger' }, - { 'name': 'done', 'state_name': ' Ready', 'state_class': 'btn-success' }] + return [{ 'name': 'normal', 'state_name': ' In Progress', 'state_icon': '<img src="/web/static/src/img/icons/gtk-normal.png"/>' }, + { 'name': 'blocked', 'state_name': ' Blocked', 'state_icon': '<img src="/web/static/src/img/icons/gtk-no.png"/>' }, + { 'name': 'done', 'state_name': ' Ready', 'state_icon': '<img src="/web/static/src/img/icons/gtk-yes.png"/>' }] }, render_value: function() { var self = this; diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 6a0253d386b..505f3e5c02d 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1011,9 +1011,9 @@ <t t-name="DropdownSelection"> <span class="btn-group"> <t t-foreach="states" t-as="rec"> - <a t-att-class="'btn btn-xs '+ rec.state_class" t-if="widget.get('value') === rec.name" t-att-title="rec.state_name" > - <t t-raw="rec.state_name"/> - <a t-att-class="'oe_legend btn btn-xs dropdown-toggle '+rec.state_class" data-toggle="dropdown"> + <a t-att-class="'btn btn-default btn-xs'" t-if="widget.get('value') === rec.name" t-att-title="rec.state_name" > + <t t-raw="rec.state_icon"/> + <a t-att-class="'oe_legend btn btn-default btn-xs dropdown-toggle'" data-toggle="dropdown"> <span class="caret"></span> <span class="sr-only">Toggle Dropdown</span> </a> </a> @@ -1021,7 +1021,10 @@ <ul class="dropdown-menu state" role="menu"> <t t-foreach="states" t-as="rec"> <t t-if="widget.get('value') !== rec.name"> - <li class="oe_legend" t-att-data-value="rec.name" ><a href="#"><t t-raw="rec.state_name" /></a></li> + <li class="oe_legend" t-att-data-value="rec.name" ><a href="#"> + <t t-raw="rec.state_icon" /> + <t t-raw="rec.state_name" /></a> + </li> </t> </t> </ul> |