7 files changed, 37 insertions, 6 deletions
diff --git a/client/components/boards/boardArchive.js b/client/components/boards/boardArchive.js
index 8f4d5434..c8bbb341 100644
--- a/client/components/boards/boardArchive.js
+++ b/client/components/boards/boardArchive.js
@@ -1,9 +1,3 @@
-Template.boardListHeaderBar.events({
-  'click .js-open-archived-board'() {
-    Modal.open('archivedBoards');
-  },
-});
-
 BlazeComponent.extendComponent({
   onCreated() {
     this.subscribe('archivedBoards');
diff --git a/client/components/boards/boardsList.jade b/client/components/boards/boardsList.jade
index 89852570..e36b8fc6 100644
--- a/client/components/boards/boardsList.jade
+++ b/client/components/boards/boardsList.jade
@@ -36,3 +36,6 @@ template(name="boardListHeaderBar")
     a.board-header-btn.js-open-archived-board
       i.fa.fa-archive
       span {{_ 'archives'}}
+    a.board-header-btn(href="{{pathFor 'board' id=templatesBoardId slug=templatesBoardSlug}}")
+      i.fa.fa-clone
+      span {{_ 'templates'}}
diff --git a/client/components/boards/boardsList.js b/client/components/boards/boardsList.js
index 1ed88146..70dd1143 100644
--- a/client/components/boards/boardsList.js
+++ b/client/components/boards/boardsList.js
@@ -1,5 +1,20 @@
 const subManager = new SubsManager();
 
+Template.boardListHeaderBar.events({
+  'click .js-open-archived-board'() {
+    Modal.open('archivedBoards');
+  },
+});
+
+Template.boardListHeaderBar.helpers({
+  templatesBoardId() {
+      return Meteor.user().getTemplatesBoard().id;
+  },
+  templatesBoardSlug() {
+      return Meteor.user().getTemplatesBoard().slug;
+  },
+});
+
 BlazeComponent.extendComponent({
   onCreated() {
     Meteor.subscribe('setting');
@@ -9,6 +24,7 @@ BlazeComponent.extendComponent({
     return Boards.find({
       archived: false,
       'members.userId': Meteor.userId(),
+      type: 'board',
     }, {
       sort: ['title'],
     });
diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade
index 25316d04..4d9b2e08 100644
--- a/client/components/cards/cardDetails.jade
+++ b/client/components/cards/cardDetails.jade
@@ -247,6 +247,9 @@ template(name="cardDetailsActionsPopup")
       unless archived
         li: a.js-archive {{_ 'archive-card'}}
       li: a.js-more {{_ 'cardMorePopup-title'}}
+    hr
+    ul.pop-over-list
+      li: a.js-template-card {{_ 'cardTemplatePopup-title'}}
 
 template(name="moveCardPopup")
   +boardsAndLists
diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js
index a571e21a..489f28ae 100644
--- a/client/components/cards/cardDetails.js
+++ b/client/components/cards/cardDetails.js
@@ -365,6 +365,9 @@ Template.cardDetailsActionsPopup.events({
       if (!err && ret) Popup.close();
     });
   },
+  'click .js-template-card' () {
+      console.log('REMOVE Creating template card');
+  },
 });
 
 Template.editCardTitleForm.onRendered(function () {
diff --git a/client/components/users/userHeader.jade b/client/components/users/userHeader.jade
index b6e10d8a..a4704933 100644
--- a/client/components/users/userHeader.jade
+++ b/client/components/users/userHeader.jade
@@ -21,6 +21,9 @@ template(name="memberMenuPopup")
       li: a.js-go-setting(href="{{pathFor 'setting'}}") {{_ 'admin-panel'}}
   hr
   ul.pop-over-list
+    li: a(href="{{pathFor 'board' id=templatesBoardId slug=templatesBoardSlug}}") {{_ 'templates'}}
+  hr
+  ul.pop-over-list
     li: a.js-logout {{_ 'log-out'}}
 
 template(name="editProfilePopup")
diff --git a/client/components/users/userHeader.js b/client/components/users/userHeader.js
index 63cbb14f..0978ec75 100644
--- a/client/components/users/userHeader.js
+++ b/client/components/users/userHeader.js
@@ -3,6 +3,15 @@ Template.headerUserBar.events({
   'click .js-change-avatar': Popup.open('changeAvatar'),
 });
 
+Template.memberMenuPopup.helpers({
+  templatesBoardId() {
+      return Meteor.user().getTemplatesBoard().id;
+  },
+  templatesBoardSlug() {
+      return Meteor.user().getTemplatesBoard().slug;
+  },
+});
+
 Template.memberMenuPopup.events({
   'click .js-edit-profile': Popup.open('editProfile'),
   'click .js-change-settings': Popup.open('changeSettings'),