diff options
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 41 |
1 files changed, 23 insertions, 18 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 446ff26c2df..62d40aa62ec 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -821,24 +821,25 @@ </t> <t t-name="FieldMany2ManyTag"> <t t-foreach="elements" t-as="el"> - <span t-attf-class="badge dropdown o_tag_color_#{el[colorField] || 10}" t-att-data-color="el[colorField] || 10" t-att-data-index="el_index" t-att-data-id="el.id"> + <t t-set="color" t-value="el[colorField] || 0"/> + <span t-attf-class="badge dropdown o_tag_color_#{color}" t-att-data-color="color" t-att-data-index="el_index" t-att-data-id="el.id"> <span class="o_badge_text"><t t-raw="el.display_name"/></span> <span t-if="!readonly" class="fa fa-times o_delete"/> </span> </t> </t> <t t-name="FieldMany2ManyTag.colorpicker"> - <ul class="o_colorpicker dropdown-menu" role="menu"> - <li t-foreach="10" t-as="color"> - <span t-att-data-id="tag_id" t-att-data-color="color" t-attf-class="o_tag_color_#{color}"/> - </li> - <li> - <span t-att-data-id="tag_id" t-att-data-color="10" class="o_tag_color_10"/> - </li> - <li> - Not shown in kanban - </li> - </ul> + <div class="o_colorpicker dropdown-menu" role="menu"> + <ul> + <li t-foreach="12" t-as="color"> + <a href="#" + t-att-data-id="tag_id" + t-att-data-color="color" + t-attf-class="o_tag_color_#{color}" + t-att-title="color === 0 ? 'Not shown in kanban' : ''"/> + </li> + </ul> + </div> </t> <t t-name="ProgressBar"> <div class="o_progressbar"> @@ -1309,16 +1310,20 @@ <span class="oe_topbar_name"/> </a> <ul class="dropdown-menu" role="menu"> - <li><a href="#" data-menu="documentation">Documentation</a></li> - <li><a href="#" data-menu="support">Support</a></li> - <li class="divider"/> - <li><a href="#" data-menu="settings">Preferences</a></li> - <li><a href="#" data-menu="account">My Odoo.com account</a></li> - <li><a href="#" data-menu="logout">Log out</a></li> + <t t-call="UserMenu.Actions"/> </ul> </li> </t> +<t t-name="UserMenu.Actions"> + <li><a href="#" data-menu="documentation">Documentation</a></li> + <li><a href="#" data-menu="support">Support</a></li> + <li class="divider"/> + <li><a href="#" data-menu="settings">Preferences</a></li> + <li><a href="#" data-menu="account">My Odoo.com account</a></li> + <li><a href="#" data-menu="logout">Log out</a></li> +</t> + <t t-name="SwitchCompanyMenu"> <li class="o_switch_company_menu"> <a class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false" href="#"> |