diff options
| author | qsm-odoo <qsm@odoo.com> | 2017-09-24 19:21:23 +0200 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2017-09-28 13:29:56 +0200 |
| commit | 2506a9564b548d0912b779bf3479123e9c565ddb (patch) | |
| tree | b1fc6633157cbf9763c5e01206a90886e6d13972 /addons/web/static/src/xml | |
| parent | 99bf9e4563d8c17be1635fc09d336b693b5ba1a1 (diff) | |
[FIX] web: review UI tag color system
- Kanban colors and tag colors are now the same
- Tag color 0 (default) is now back to be the invisible kanban one
- Same colorpicker for kanban and tags
- Define correct number of colors (12 not 13)
- Color 0 should be a neutral one (gray)
- ...
Diffstat (limited to 'addons/web/static/src/xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 40b94a5a11d..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"> |