1 files changed, 91 insertions, 12 deletions
diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade
index f72abe6d..b888210b 100644
--- a/client/components/cards/cardDetails.jade
+++ b/client/components/cards/cardDetails.jade
@@ -9,14 +9,44 @@ template(name="cardDetails")
           a.fa.fa-navicon.card-details-menu.js-open-card-details-menu
         h2.card-details-title.js-card-title(
           class="{{#if canModifyCard}}js-open-inlined-form is-editable{{/if}}")
-            = title
-            if isWatching
-              i.fa.fa-eye.card-details-watch
+            +viewer
+              = title
+              if isWatching
+                i.fa.fa-eye.card-details-watch
 
     if archived
       p.warning {{_ 'card-archived'}}
 
     .card-details-items
+      .card-details-item.card-details-item-received
+        h3.card-details-item-title {{_ 'card-received'}}
+        if receivedAt
+          +cardReceivedDate
+        else
+          a.js-received-date {{_ 'add'}}
+
+      .card-details-item.card-details-item-start
+        h3.card-details-item-title {{_ 'card-start'}}
+        if startAt
+          +cardStartDate
+        else
+          a.js-start-date {{_ 'add'}}
+
+      .card-details-item.card-details-item-due
+        h3.card-details-item-title {{_ 'card-due'}}
+        if dueAt
+          +cardDueDate
+        else
+          a.js-due-date {{_ 'add'}}
+
+      .card-details-item.card-details-item-end
+        h3.card-details-item-title {{_ 'card-end'}}
+        if endAt
+          +cardEndDate
+        else
+          a.js-end-date {{_ 'add'}}
+
+    .card-details-items
       .card-details-item.card-details-item-members
         h3.card-details-item-title {{_ 'members'}}
         each members
@@ -51,6 +81,15 @@ template(name="cardDetails")
             = definition.name
           +cardCustomField
 
+    .card-details-items
+      if spentTime
+        .card-details-item.card-details-item-spent
+          if isOvertime
+            h3.card-details-item-title {{_ 'overtime-hours'}}
+          else
+            h3.card-details-item-title {{_ 'spent-time-hours'}}
+          +cardSpentTime
+
     //- XXX We should use "editable" to avoid repetiting ourselves
     if canModifyCard
       h3.card-details-item-title {{_ 'description'}}
@@ -81,16 +120,24 @@ template(name="cardDetails")
     hr
     +checklists(cardId = _id)
 
-    if attachments.count
-      hr
-      h2
-        i.fa.fa-paperclip
-        | {{_ 'attachments'}}
+    hr
+    h3
+      i.fa.fa-paperclip
+      | {{_ 'attachments'}}
 
-      +attachmentsGalery
+    +attachmentsGalery
 
     hr
-    h2 {{ _ 'activity'}}
+    .activity-title
+      h3 {{ _ 'activity'}}
+      if currentUser.isBoardMember
+        .material-toggle-switch
+          span.toggle-switch-title {{_ 'hide-system-messages'}}
+          if hiddenSystemMessages
+            input.toggle-switch(type="checkbox" id="toggleButton" checked="checked")
+          else
+            input.toggle-switch(type="checkbox" id="toggleButton")
+          label.toggle-label(for="toggleButton")
     if currentUser.isBoardMember
       +commentForm
     if isLoaded.get
@@ -112,9 +159,12 @@ template(name="cardDetailsActionsPopup")
       li: a.js-members {{_ 'card-edit-members'}}
       li: a.js-labels {{_ 'card-edit-labels'}}
       li: a.js-attachments {{_ 'card-edit-attachments'}}
+      li: a.js-received-date {{_ 'editCardReceivedDatePopup-title'}}
       li: a.js-custom-fields {{_ 'card-edit-custom-fields'}}
       li: a.js-start-date {{_ 'editCardStartDatePopup-title'}}
       li: a.js-due-date {{_ 'editCardDueDatePopup-title'}}
+      li: a.js-end-date {{_ 'editCardEndDatePopup-title'}}
+      li: a.js-spent-time {{_ 'editCardSpentTimePopup-title'}}
     hr
     ul.pop-over-list
       li: a.js-move-card-to-top {{_ 'moveCardToTop-title'}}
@@ -123,19 +173,48 @@ template(name="cardDetailsActionsPopup")
     ul.pop-over-list
       li: a.js-move-card {{_ 'moveCardPopup-title'}}
       li: a.js-copy-card {{_ 'copyCardPopup-title'}}
+      li: a.js-copy-checklist-cards {{_ 'copyChecklistToManyCardsPopup-title'}}
       unless archived
         li: a.js-archive {{_ 'archive-card'}}
       li: a.js-more {{_ 'cardMorePopup-title'}}
 
 template(name="moveCardPopup")
-  +boardLists
+  +boardsAndLists
 
 template(name="copyCardPopup")
   label(for='copy-card-title') {{_ 'title'}}:
   textarea#copy-card-title.minicard-composer-textarea.js-card-title(autofocus)
     = title
+  +boardsAndLists
+
+
+template(name="copyChecklistToManyCardsPopup")
+  label(for='copy-checklist-cards-title') {{_ 'copyChecklistToManyCardsPopup-instructions'}}:
+  textarea#copy-card-title.minicard-composer-textarea.js-card-title(autofocus)
+    | {{_ 'copyChecklistToManyCardsPopup-format'}}
+  +boardsAndLists
+
+template(name="boardsAndLists")
+  label {{_ 'boards'}}:
+  select.js-select-boards
+    each boards
+      if $eq _id currentBoard._id
+        option(value="{{_id}}" selected) {{_ 'current'}}
+      else
+        option(value="{{_id}}") {{title}}
+
+  label {{_ 'swimlanes'}}:
+  select.js-select-swimlanes
+    each swimlanes
+      option(value="{{_id}}") {{title}}
+
   label {{_ 'lists'}}:
-  +boardLists
+  select.js-select-lists
+    each aBoardLists
+      option(value="{{_id}}") {{title}}
+
+  .edit-controls.clearfix
+    button.primary.confirm.js-done {{_ 'done'}}
 
 template(name="cardMembersPopup")
   ul.pop-over-list.js-card-member-list