diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-03-30 15:41:15 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-03-30 15:41:15 +0200 |
| commit | e4f218e9952395adba42c489123bfd57eeecef3d (patch) | |
| tree | 4b83a00647ca0e3c611e5d8d358f41add28e18b7 /addons/web/static/src | |
| parent | 42587a56a65315ba580574707a26f15824825bf2 (diff) | |
| parent | a3a5ea21ed063492df027edb641790f8e6fa919f (diff) | |
[MERGE] Merged with last fixes from needaction web branch
bzr revid: tde@openerp.com-20120330120444-dl20z565akpdqgtu
bzr revid: tde@openerp.com-20120330134115-re34u23tko7b8d9f
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/css/base.css | 11 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 5 |
2 files changed, 16 insertions, 0 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index b0a2b7945b9..3f44d6f6cda 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -264,6 +264,17 @@ border-right: 4px solid transparent; border-top: 4px solid #4c4c4c; } +.oe_menu_counter { + float:right; + background: #eeeeee; + color: #8a89ba; + font-weight: bold; + border-width:1px; + padding-top:2px; + padding-right:4px; + padding-left:4px; + border-radius:2px; +} .openerp2 .oe_dropdown { position: relative; } diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 894f7353c1a..80e097e4a5e 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -368,6 +368,11 @@ t-att-data-action-model="menu.action ? menu.action.split(',')[0] : ''" t-att-data-action-id="menu.action ? menu.action.split(',')[1] : ''"> <t t-esc="menu.name"/> + <t t-if="menu.needaction_enabled"> + <div class="oe_menu_counter"> + <t t-esc="menu.needaction_counter"/> + </div> + </t> </a> </t> |