summaryrefslogtreecommitdiffstats
path: root/client/components/activities
diff options
context:
space:
mode:
authorlksime <lkisme@me.com>2017-01-20 21:05:48 +0800
committerlksime <lkisme@me.com>2017-01-20 21:05:48 +0800
commit59731af139b73f4b9cd8bd0bd0602ac272538b4f (patch)
tree48711ded51c6540e6c01f439e566d22d6a6ac7a6 /client/components/activities
parent38c143b8bf569d6a08caf580b20d2fa5a4ea8abf (diff)
downloadwekan-59731af139b73f4b9cd8bd0bd0602ac272538b4f.tar.gz
wekan-59731af139b73f4b9cd8bd0bd0602ac272538b4f.tar.bz2
wekan-59731af139b73f4b9cd8bd0bd0602ac272538b4f.zip
Add checklist feature
Diffstat (limited to 'client/components/activities')
-rw-r--r--client/components/activities/activities.jade11
-rw-r--r--client/components/activities/activities.styl8
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%)