2 files changed, 13 insertions, 58 deletions
diff --git a/client/components/boards/boardBody.jade b/client/components/boards/boardBody.jade
index b480bc0f..0a454e92 100644
--- a/client/components/boards/boardBody.jade
+++ b/client/components/boards/boardBody.jade
@@ -26,4 +26,10 @@ template(name="boardBody")
       if isViewLists
         +listsGroup
       if isViewCalendar
-        +fullcalendar(calendarOptions)
+        +calendarView
+
+template(name="calendarView")
+  .swimlane.list-group.js-lists
+    if currentCard
+      +cardDetails(currentCard)
+    +fullcalendar
diff --git a/client/components/boards/boardBody.js b/client/components/boards/boardBody.js
index 935c550f..911b0120 100644
--- a/client/components/boards/boardBody.js
+++ b/client/components/boards/boardBody.js
@@ -113,63 +113,6 @@ BlazeComponent.extendComponent({
         .childComponents('addListForm')[0].open();
     }
   },
-
-  calendarOptions() {
-    return {
-      id: 'calendar-view',
-      defaultView: 'basicWeek',
-      header: {
-        left: 'title',
-        center: 'agendaDay,listDay,timelineDay agendaWeek,listWeek,timelineWeek month,timelineMonth timelineYear',
-        right: 'today prev,next',
-      },
-      views: {
-        basic: {
-          // options apply to basicWeek and basicDay views
-        },
-        agenda: {
-          // options apply to agendaWeek and agendaDay views
-        },
-        week: {
-          // options apply to basicWeek and agendaWeek views
-        },
-        day: {
-          // options apply to basicDay and agendaDay views
-        },
-      },
-      themeSystem: 'jquery-ui',
-      height: 'parent',
-      /* TODO: lists as resources: https://fullcalendar.io/docs/vertical-resource-view */
-      navLinks: true,
-      nowIndicator: true,
-      businessHours: {
-        // days of week. an array of zero-based day of week integers (0=Sunday)
-        dow: [ 1, 2, 3, 4, 5 ], // Monday - Thursday
-        start: '8:00',
-        end: '18:00',
-      },
-      locale: TAPi18n.getLanguage(),
-      events(start, end, timezone, callback) {
-        const currentBoard = Boards.findOne(Session.get('currentBoard'));
-        const events = [];
-        currentBoard.cardsInInterval(start.toDate(), end.toDate()).forEach(function(card){
-          events.push({
-            id: card.id,
-            title: card.title,
-            start: card.startAt,
-            end: card.endAt,
-            url: FlowRouter.url('card', {
-              boardId: currentBoard._id,
-              slug: currentBoard.slug,
-              cardId: card._id,
-            }),
-          });
-        });
-        callback(events);
-      },
-    };
-  },
-
   events() {
     return [{
       // XXX The board-overlay div should probably be moved to the parent
@@ -202,3 +145,9 @@ BlazeComponent.extendComponent({
   },
 
 }).register('boardBody');
+
+BlazeComponent.extendComponent({
+  onRendered() {
+
+  },
+}).register('calendarView');