pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] web: BS4, restore statusbar "more" dropdown

Browse Source
This commit is contained in:
Siddarth Gajjar
2018-08-19 16:57:14 +02:00
committed by qsm-odoo
parent 6b84bdeaf9
commit c0629cd757
2 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/scss/form_view.scss
+2 -14
View File
@@ -175,7 +175,6 @@
flex-flow: row-reverse wrap-reverse;
align-self: stretch;
align-items: stretch;
overflow-x: hidden; // to prevent horizontal scroll due to last arrow
> .o_arrow_button {
min-height: $o-statusbar-height;
@@ -190,6 +189,7 @@
&:first-child {
padding-right: $o-horizontal-padding; // Compensate container padding
overflow-x: hidden; // to prevent horizontal scroll due to last arrow
}
&:last-child {
padding-left: $o-horizontal-padding - 1;
@@ -207,7 +207,7 @@
border-left: 1px solid gray('300');
}
&:before, &:after {
&:before, &:not(:first-child):after {
content: " ";
display: block;
@include o-position-absolute(0, -$o-statusbar-arrow-width + 1);
@@ -246,20 +246,8 @@
border-left-color: gray('200');
}
}
.caret {
margin-top: -2px;
}
}
.o-status-more {
@include o-position-absolute(100%, 0);
min-width: 100px;
> li > button {
width: 100%;
text-align: left;
}
}
}
// Touch device mode
addons/web/static/src/xml/base.xml
+7 -5
View File
@@ -886,9 +886,11 @@
<t t-name="FieldStatus.content">
<t t-if="selection_folded.length">
<button type="button" class="btn o_arrow_button btn-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">More</button>
<div class="dropdown-menu o-status-more" role="menu">
<div class="dropdown-menu" role="menu">
<t t-foreach="selection_folded" t-as="i">
<t t-call="FieldStatus.content.button"/>
<t t-call="FieldStatus.content.button">
<t t-set="is_dropdown" t-value="true"/>
</t>
</t>
</div>
</t>
@@ -899,15 +901,15 @@
<t t-name="FieldStatus.content.button">
<t t-set="disabled" t-value="!clickable"/>
<button type="button" t-att-data-value="i.id" disabled="disabled" title="Current state" aria-pressed="true"
class="btn o_arrow_button btn-primary disabled" t-if="i.selected" aria-current="step">
t-attf-class="btn o_arrow_button btn-primary disabled #{is_dropdown ? 'dropdown-item bg-primary text-white': ''}" t-if="i.selected" aria-current="step">
<t t-esc="i.display_name" role="img" t-attf-aria-label="#{i.display_name} is current state"/>
</button>
<button type="button" t-att-data-value="i.id" disabled="disabled" title="Not active state" aria-pressed="false"
class="btn o_arrow_button btn-secondary disabled" t-if="!i.selected and disabled">
t-attf-class="btn o_arrow_button btn-secondary disabled #{is_dropdown ? 'dropdown-item': ''}" t-if="!i.selected and disabled">
<t t-esc="i.display_name" role="img" t-attf-aria-label="#{i.display_name} is not current state"/>
</button>
<button type="button" t-att-data-value="i.id" title="Not active state, click to change it" aria-pressed="false"
class="btn o_arrow_button btn-secondary" t-if="!i.selected and !disabled">
t-attf-class="btn o_arrow_button btn-secondary #{is_dropdown ? 'dropdown-item': ''}" t-if="!i.selected and !disabled">
<t t-esc="i.display_name" role="img" t-attf-aria-label="Click to change current state to #{i.display_name}"/>
</button>
</t>