odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] web: correct StatusField widget to use dropdown menu 

bzr revid: chs@openerp.com-20131018094336-3s8s3uggs60jwkl0
This commit is contained in:
Christophe Simonis 2013-10-18 11:43:36 +02:00
parent 685c4f4d4c
commit 3853f642ff
4 changed files with 27 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
addons/web/static/src/css/base.css
View File

@ -700,10 +700,8 @@
.openerp .oe_dropdown_menu {
display: none;
position: absolute;
top: 26px;
z-index: 3;
margin: 0;
padding: 0;
border: 1px solid #afafb6;
background: white;
padding: 4px 0;
@ -1116,7 +1114,7 @@
border-color: #999999;
border-color: rgba(0, 0, 0, 0.2);
border-style: solid;
border-width: 0 1px 1px;
border-width: 0 2px 1px;
-moz-border-radius: 0 0 6px 6px;
-webkit-border-radius: 0 0 6px 6px;
border-radius: 0 0 6px 6px;
@ -2736,32 +2734,20 @@
-o-transform: rotate(45deg);
transform: rotate(45deg);
}
.openerp ul.oe_form_status .oe_folded .label, .openerp ul.oe_form_status_clickable .oe_folded .label {
padding-bottom: 8px;
}
.openerp ul.oe_form_status .oe_folded ul, .openerp ul.oe_form_status_clickable .oe_folded ul {
position: absolute;
z-index: 1000;
border-top: 1px solid #cacaca;
float: none;
top: 30px;
right: 0;
.openerp ul.oe_form_status ul.oe_dropdown_menu, .openerp ul.oe_form_status_clickable ul.oe_dropdown_menu {
display: none;
padding: 0;
min-width: 0;
}
.openerp ul.oe_form_status .oe_folded ul li, .openerp ul.oe_form_status_clickable .oe_folded ul li {
.openerp ul.oe_form_status ul.oe_dropdown_menu.oe_opened, .openerp ul.oe_form_status_clickable ul.oe_dropdown_menu.oe_opened {
display: block;
}
.openerp ul.oe_form_status ul.oe_dropdown_menu li, .openerp ul.oe_form_status_clickable ul.oe_dropdown_menu li {
margin: 0;
border-left: 1px solid #cacaca;
display: block;
width: 100%;
}
.openerp ul.oe_form_status .oe_folded ul li.label, .openerp ul.oe_form_status_clickable .oe_folded ul li.label {
border: 0;
padding-left: 24px;
}
.openerp ul.oe_form_status .oe_folded ul li:last-child, .openerp ul.oe_form_status_clickable .oe_folded ul li:last-child {
border-bottom: 1px solid #cacaca;
}
.openerp ul.oe_form_status .oe_folded:hover ul, .openerp ul.oe_form_status_clickable .oe_folded:hover ul {
display: block;
.openerp ul.oe_form_status ul.oe_dropdown_menu li span.label, .openerp ul.oe_form_status_clickable ul.oe_dropdown_menu li span.label {
padding-left: 14px;
}
.openerp ul.oe_form_status li.oe_active, .openerp ul.oe_form_status_clickable li.oe_active {
background-color: #5382b9;

36
addons/web/static/src/css/base.sass
View File

@ -606,10 +606,8 @@ $sheet-padding: 16px
.oe_dropdown_menu
display: none
position: absolute
top: 26px
z-index: 3
margin: 0
padding: 0
border: 1px solid $tag-border
background: white
padding: 4px 0
@ -914,7 +912,7 @@ $sheet-padding: 16px
border-color: #999
border-color: rgba(0, 0, 0, 0.2)
border-style: solid
border-width: 0 1px 1px
border-width: 0 2px 1px
@include radius(0 0 6px 6px)
@include background-clip()
li
@ -2174,28 +2172,18 @@ $sheet-padding: 16px
@include skew-gradient(#fcfcfc, #dedede)
@include radius(3px)
@include transform(rotate(45deg))
.oe_folded
.label
padding-bottom: 8px
ul
position: absolute
z-index: 1000
border-top: 1px solid #cacaca
float: none
top: 30px
right: 0
display: none
li
margin: 0
border-left: 1px solid #cacaca
display: block
li.label
border: 0
padding-left: 24px
li:last-child
border-bottom: 1px solid #cacaca
&:hover ul
ul.oe_dropdown_menu
display: none
padding: 0
min-width: 0
&.oe_opened
display: block
li
margin: 0
width: 100%
span.label
padding-left: 14px
li.oe_active
@include vertical-gradient(#729fcf, #3465a4)
> .arrow span

2
addons/web/static/src/js/view_form.js
View File

@ -5475,7 +5475,7 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({
});
this.get_selection();
if (this.options.clickable) {
this.$el.on('click','li:not(.oe_folded)',this.on_click_stage);
this.$el.on('click','li[data-id]',this.on_click_stage);
}
if (this.$el.parent().is('header')) {
this.$el.after('<div class="oe_clear"/>');

6
addons/web/static/src/xml/base.xml
View File

@ -1228,9 +1228,9 @@
</li>
</t>
<t t-if="widget.selection.folded.length">
<li t-att-class="value_folded ? 'oe_active oe_folded' : 'oe_folded'">
<span class="label"> ... </span>
<ul>
<li>
<span class="label oe_dropdown_toggle oe_dropdown_arrow">More</span>
<ul class="oe_dropdown_menu">
<t t-foreach="widget.selection.folded" t-as="i">
<li t-att-class="i[0] === widget.get('value') ? 'oe_active' : ''" t-att-data-id="i[0]">
<span class="label"><t t-esc="i[1]"/></span>