2 files changed, 16 insertions, 10 deletions

diff --git a/client/components/lists/listBody.jade b/client/components/lists/listBody.jade
index f030833b..10d39d15 100644
--- a/client/components/lists/listBody.jade
+++ b/client/components/lists/listBody.jade
@@ -45,13 +45,14 @@ template(name="addCardForm")
   .add-controls.clearfix
     button.primary.confirm(type="submit") {{_ 'add'}}
     unless isSandstorm
-      span.quiet
-        | {{_ 'or'}}
-        a.js-link {{_ 'link'}}
-      span.quiet
-        |  
-        | /
-        a.js-search {{_ 'search'}}
+      unless currentBoard.isTemplatesBoard
+        span.quiet
+          | {{_ 'or'}}
+          a.js-link {{_ 'link'}}
+        span.quiet
+          |  
+          | /
+          a.js-search {{_ 'search'}}
 
 template(name="autocompleteLabelLine")
   .minicard-label(class="card-label-{{colorName}}" title=labelName)
diff --git a/client/components/lists/listBody.js b/client/components/lists/listBody.js
index 0f5caac5..576bcd9f 100644
--- a/client/components/lists/listBody.js
+++ b/client/components/lists/listBody.js
@@ -70,7 +70,11 @@ BlazeComponent.extendComponent({
     const boardId = this.data().board();
     let swimlaneId = '';
     const boardView = Meteor.user().profile.boardView;
-    if (boardView === 'board-view-swimlanes')
+    let cardType = 'cardType-card';
+    if (this.data().board().isTemplatesBoard()) {
+      swimlaneId = this.parentComponent().parentComponent().data()._id; // Always swimlanes view
+      cardType = (Swimlanes.findOne(swimlaneId).isCardTemplatesSwimlane())?'template-card':'cardType-card';
+    } else if (boardView === 'board-view-swimlanes')
       swimlaneId = this.parentComponent().parentComponent().data()._id;
     else if ((boardView === 'board-view-lists') || (boardView === 'board-view-cal'))
       swimlaneId = boardId.getDefaultSwimline()._id;
@@ -85,7 +89,7 @@ BlazeComponent.extendComponent({
         boardId: boardId._id,
         sort: sortIndex,
         swimlaneId,
-        type: 'cardType-card',
+        type: cardType,
       });
 
       // if the displayed card count is less than the total cards in the list,
@@ -149,7 +153,8 @@ BlazeComponent.extendComponent({
 
   idOrNull(swimlaneId) {
     const currentUser = Meteor.user();
-    if (currentUser.profile.boardView === 'board-view-swimlanes')
+    if (currentUser.profile.boardView === 'board-view-swimlanes'
+        || this.data().board().isTemplatesBoard())
       return swimlaneId;
     return undefined;
   },