diff options
| author | Robot Odoo <xmo+roboto@odoo.com> | 2019-06-04 21:40:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-04 21:40:44 +0200 |
| commit | 3a55c4616d5dd0d4ed3cdfc9eb6f75d4818a9a06 (patch) | |
| tree | 624f9524bf833cfb6ae80c7d064cf36b6e63db51 /addons/web/static/src/xml/base.xml | |
| parent | ece2fed1545faa388777227d3a7525cf99ab1217 (diff) | |
| parent | fd86ffd5aa6f633de879bd62b2fe0b6826395825 (diff) | |
[MERGE] base: Improve multi-company UX
TaskID: 2000277
closes odoo/odoo#33876
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 77e8ab075b1..e46c256b851 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1570,6 +1570,16 @@ </t> <t t-foreach="widget.user_companies" t-as="company"> <div role="menuitem" href="#" class="dropdown-item d-flex py-0 px-0" data-menu="company" t-att-data-company-id="company[0]"> + <div class="ml-auto pl-3 pr-3 border border-top-0 border-left-0 border-bottom-0 toggle_company o_py"> + <span style="height: 2rem;"> + <t t-if="widget.allowed_company_ids.includes(company[0].toString())"> + <i class="fa fa-fw fa-check-square pt-2"></i> + </t> + <t t-if="!widget.allowed_company_ids.includes(company[0].toString())"> + <i class="fa fa-fw fa-square-o pt-2"></i> + </t> + </span> + </div> <div class="d-flex flex-grow-1 align-items-center py-0 log_into pl-3 o_py" t-att-style="company[0] === widget.current_company ? 'background-color: lightgrey;' : ''"> <t t-if="widget.allowed_company_ids.includes(company[0].toString())"> <span class='mr-3 company_label'> @@ -1582,18 +1592,6 @@ </span> </t> </div> - <t t-if="widget.toggle_company"> - <div class="ml-auto pl-3 pr-3 border border-top-0 border-right-0 border-bottom-0 toggle_company o_py"> - <span style="height: 2rem;"> - <t t-if="widget.allowed_company_ids.includes(company[0].toString())"> - <i class="fa fa-fw fa-check-square pt-2"></i> - </t> - <t t-if="!widget.allowed_company_ids.includes(company[0].toString())"> - <i class="fa fa-fw fa-square-o pt-2"></i> - </t> - </span> - </div> - </t> </div> </t> </div> |