浏览代码

Activities, adding back "created at" field

Fixes #5459
Martin Filser 10 月之前
父节点
当前提交
e538fb9514
共有 1 个文件被更改,包括 6 次插入6 次删除
  1. 6 6
      client/components/activities/activities.jade

+ 6 - 6
client/components/activities/activities.jade

@@ -16,7 +16,6 @@ template(name="cardActivities")
     +activity(activity=activityData card=card mode=mode)
     +activity(activity=activityData card=card mode=mode)
 
 
 template(name="editOrDeleteComment")
 template(name="editOrDeleteComment")
-  = ' - '
   a.js-open-inlined-form {{_ "edit"}}
   a.js-open-inlined-form {{_ "edit"}}
   = ' - '
   = ' - '
   a.js-delete-comment {{_ "delete"}}
   a.js-delete-comment {{_ "delete"}}
@@ -145,11 +144,10 @@ template(name="activity")
               +viewer
               +viewer
                 = activity.comment.text
                 = activity.comment.text
             +commentReactions(reactions=activity.comment.reactions commentId=activity.comment._id)
             +commentReactions(reactions=activity.comment.reactions commentId=activity.comment._id)
-            span(title=activity.createdAt).activity-meta {{ moment activity.createdAt }}
-              if($eq currentUser._id activity.comment.userId)
-                +editOrDeleteComment
-              else if currentUser.isBoardAdmin
-                +editOrDeleteComment
+            if($eq currentUser._id activity.comment.userId)
+              +editOrDeleteComment
+            else if currentUser.isBoardAdmin
+              +editOrDeleteComment
 
 
         if($eq activity.activityType 'deleteComment')
         if($eq activity.activityType 'deleteComment')
           | {{{_ 'activity-deleteComment' activity.commentId}}}.
           | {{{_ 'activity-deleteComment' activity.commentId}}}.
@@ -242,3 +240,5 @@ template(name="activity")
         = ' @'
         = ' @'
       else if(currentData.timeValue)
       else if(currentData.timeValue)
         | {{_ activity.activityType currentData.timeValue}}
         | {{_ activity.activityType currentData.timeValue}}
+
+      div(title=activity.createdAt).activity-meta {{ moment activity.createdAt }}