Browse Source

Display start and due dates in minicards.

shoetten 9 years ago
parent
commit
80b93ce711

+ 18 - 6
client/components/cards/cardDate.js

@@ -158,8 +158,7 @@ const CardDate = BlazeComponent.extendComponent({
   },
   },
 });
 });
 
 
-// cardStartDate
-(class extends CardDate {
+class CardStartDate extends CardDate {
   onCreated() {
   onCreated() {
     super();
     super();
     let self = this;
     let self = this;
@@ -173,10 +172,10 @@ const CardDate = BlazeComponent.extendComponent({
       'click .js-edit-date': Popup.open('editCardStartDate'),
       'click .js-edit-date': Popup.open('editCardStartDate'),
     });
     });
   }
   }
-}).register('cardStartDate');
+}
+CardStartDate.register('cardStartDate');
 
 
-// cardDueDate
-(class extends CardDate {
+class CardDueDate extends CardDate {
   onCreated() {
   onCreated() {
     super();
     super();
     let self = this;
     let self = this;
@@ -190,4 +189,17 @@ const CardDate = BlazeComponent.extendComponent({
       'click .js-edit-date': Popup.open('editCardDueDate'),
       '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');

+ 6 - 0
client/components/cards/minicard.jade

@@ -23,3 +23,9 @@ template(name="minicard")
         .badge
         .badge
           span.badge-icon.fa.fa-paperclip
           span.badge-icon.fa.fa-paperclip
           span.badge-text= attachments.count
           span.badge-text= attachments.count
+      if startAt
+        .badge
+          +minicardStartDate
+      if dueAt
+        .badge
+          +minicardDueDate

+ 4 - 1
client/components/cards/minicard.styl

@@ -91,10 +91,13 @@
       margin-right: 11px
       margin-right: 11px
       margin-bottom: 3px
       margin-bottom: 3px
       font-size: 0.9em
       font-size: 0.9em
+      
+      &:last-of-type
+        margin-right: 0
 
 
       .badge-icon,
       .badge-icon,
       .badge-text
       .badge-text
-        vertical-align: top
+        vertical-align: middle
 
 
       .badge-text
       .badge-text
         font-size: 0.9em
         font-size: 0.9em