diff --git a/plugins/tasklist/skins/larry/tasklist.css b/plugins/tasklist/skins/larry/tasklist.css index 173704dc..caa50676 100644 --- a/plugins/tasklist/skins/larry/tasklist.css +++ b/plugins/tasklist/skins/larry/tasklist.css @@ -806,6 +806,12 @@ label.block { /* cursor: pointer; */ } +.form-section span.tag-element.inherit { + color: #666; + background: #f2f2f2; + border-color: #ddd; +} + .tagedit-list li.tagedit-listelement-old a.tagedit-close, .tagedit-list li.tagedit-listelement-old a.tagedit-break, .tagedit-list li.tagedit-listelement-old a.tagedit-delete, diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js index e52174ba..19db0fe9 100644 --- a/plugins/tasklist/tasklist.js +++ b/plugins/tasklist/tasklist.js @@ -921,10 +921,22 @@ function rcube_tasklist_ui(settings) $('#task-completeness .task-text').html(((rec.complete || 0) * 100) + '%'); $('#task-list .task-text').html(Q(me.tasklists[rec.list] ? me.tasklists[rec.list].name : '')); - var taglist = $('#task-tags')[(rec.tags && rec.tags.length ? 'show' : 'hide')]().children('.task-text').empty(); + var itags = get_inherited_tags(rec); + var taglist = $('#task-tags')[(rec.tags && rec.tags.length || itags.length ? 'show' : 'hide')]().children('.task-text').empty(); if (rec.tags && rec.tags.length) { $.each(rec.tags, function(i,val){ - $('').addClass('tag-element').html(Q(val)).data('value', val).appendTo(taglist); + $('').addClass('tag-element').html(Q(val)).appendTo(taglist); + }); + } + + // append inherited tags + if (itags.length) { + $.each(itags, function(i,val){ + $('').addClass('tag-element inherit').html(Q(val)).appendTo(taglist); + }); + // re-sort tags list + $(taglist).children().sortElements(function(a,b){ + return $.text([a]).toLowerCase() > $.text([b]).toLowerCase() ? 1 : -1; }); }