From 80b93ce7117326464b55a76a9efbeeff36f28248 Mon Sep 17 00:00:00 2001
From: shoetten <simon@hoetten.org>
Date: Fri, 5 Feb 2016 21:01:43 +0100
Subject: Display start and due dates in minicards.

---
 client/components/cards/cardDate.js   | 24 ++++++++++++++++++------
 client/components/cards/minicard.jade |  6 ++++++
 client/components/cards/minicard.styl |  5 ++++-
 3 files changed, 28 insertions(+), 7 deletions(-)

(limited to 'client/components/cards')

diff --git a/client/components/cards/cardDate.js b/client/components/cards/cardDate.js
index 4a24941d..4152d618 100644
--- a/client/components/cards/cardDate.js
+++ b/client/components/cards/cardDate.js
@@ -158,8 +158,7 @@ const CardDate = BlazeComponent.extendComponent({
   },
 });
 
-// cardStartDate
-(class extends CardDate {
+class CardStartDate extends CardDate {
   onCreated() {
     super();
     let self = this;
@@ -173,10 +172,10 @@ const CardDate = BlazeComponent.extendComponent({
       'click .js-edit-date': Popup.open('editCardStartDate'),
     });
   }
-}).register('cardStartDate');
+}
+CardStartDate.register('cardStartDate');
 
-// cardDueDate
-(class extends CardDate {
+class CardDueDate extends CardDate {
   onCreated() {
     super();
     let self = this;
@@ -190,4 +189,17 @@ const CardDate = BlazeComponent.extendComponent({
       'click .js-edit-date': Popup.open('editCardDueDate'),
     });
   }
-}).register('cardDueDate');
+}
+CardDueDate.register('cardDueDate');
+
+(class extends CardStartDate {
+  showDate() {
+    return this.date.get().format('l');
+  }
+}).register('minicardStartDate');
+
+(class extends CardDueDate {
+  showDate() {
+    return this.date.get().format('l');
+  }
+}).register('minicardDueDate');
diff --git a/client/components/cards/minicard.jade b/client/components/cards/minicard.jade
index 1dfd2f8e..edc7d2d3 100644
--- a/client/components/cards/minicard.jade
+++ b/client/components/cards/minicard.jade
@@ -23,3 +23,9 @@ template(name="minicard")
         .badge
           span.badge-icon.fa.fa-paperclip
           span.badge-text= attachments.count
+      if startAt
+        .badge
+          +minicardStartDate
+      if dueAt
+        .badge
+          +minicardDueDate
diff --git a/client/components/cards/minicard.styl b/client/components/cards/minicard.styl
index 0f6f8ad2..a61f6067 100644
--- a/client/components/cards/minicard.styl
+++ b/client/components/cards/minicard.styl
@@ -91,10 +91,13 @@
       margin-right: 11px
       margin-bottom: 3px
       font-size: 0.9em
+      
+      &:last-of-type
+        margin-right: 0
 
       .badge-icon,
       .badge-text
-        vertical-align: top
+        vertical-align: middle
 
       .badge-text
         font-size: 0.9em
-- 
cgit v1.2.3-1-g7c22