diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-02-03 02:02:47 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-02-03 02:02:47 +0200 |
| commit | 40594485d869be1638ea619bf655cc1de2e079db (patch) | |
| tree | 70bb050626b491155f393db2ff3f5546d6a6ae2c /client/components/activities | |
| parent | 70f92c6e0e3e15444cdb20987ce0544ec691d606 (diff) | |
| parent | 335b91f0a48c2c64a96a74e8a2b9866bf590714a (diff) | |
| download | wekan-40594485d869be1638ea619bf655cc1de2e079db.tar.gz wekan-40594485d869be1638ea619bf655cc1de2e079db.tar.bz2 wekan-40594485d869be1638ea619bf655cc1de2e079db.zip | |
Add checklist feature: Merge branch 'lkisme-ckls' into devel
Diffstat (limited to 'client/components/activities')
| -rw-r--r-- | client/components/activities/activities.jade | 11 | ||||
| -rw-r--r-- | client/components/activities/activities.styl | 8 |
2 files changed, 19 insertions, 0 deletions
diff --git a/client/components/activities/activities.jade b/client/components/activities/activities.jade index 9ff73864..9bbcd055 100644 --- a/client/components/activities/activities.jade +++ b/client/components/activities/activities.jade @@ -26,6 +26,12 @@ template(name="boardActivities") +viewer = comment.text + if($eq activityType 'addChecklist') + | {{{_ 'activity-checklist-added' cardLink}}}. + .activity-checklist(href="{{ card.absoluteUrl }}") + +viewer + = checklist.title + if($eq activityType 'archivedCard') | {{{_ 'activity-archived' cardLink}}}. @@ -103,6 +109,11 @@ template(name="cardActivities") | {{{_ 'activity-attached' attachmentLink cardLabel}}}. if attachment.isImage img.attachment-image-preview(src=attachment.url) + if($eq activityType 'addChecklist') + | {{{_ 'activity-checklist-added' cardLabel}}}. + .activity-checklist + +viewer + = checklist.title if($eq activityType 'addComment') +inlinedForm(classNames='js-edit-comment') diff --git a/client/components/activities/activities.styl b/client/components/activities/activities.styl index 1f0494c7..2285fc0a 100644 --- a/client/components/activities/activities.styl +++ b/client/components/activities/activities.styl @@ -26,6 +26,14 @@ margin-top: 5px padding: 5px + .activity-checklist + display: block + border-radius: 3px + background: white + text-decoration: none + box-shadow: 0 1px 2px rgba(0,0,0,.2) + margin-top: 5px + padding: 5px .activity-meta font-size: 0.8em color: darken(white, 40%) |