5 files changed, 15 insertions, 0 deletions
diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade
index cb86e9bb..a0160382 100644
--- a/client/components/boards/boardHeader.jade
+++ b/client/components/boards/boardHeader.jade
@@ -117,6 +117,9 @@ template(name="boardChangeTitlePopup")
     label
       | {{_ 'title'}}
       input.js-board-name(type="text" value=title autofocus)
+    label
+      | {{_ 'description'}}
+      textarea.js-board-desc= description
     input.primary.wide(type="submit" value="{{_ 'rename'}}")
 
 template(name="archiveBoardPopup")
diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js
index 92d5f6d4..3dc6d754 100644
--- a/client/components/boards/boardHeader.js
+++ b/client/components/boards/boardHeader.js
@@ -18,8 +18,10 @@ Template.boardMenuPopup.events({
 Template.boardChangeTitlePopup.events({
   submit(evt, tpl) {
     const newTitle = tpl.$('.js-board-name').val().trim();
+    const newDesc = tpl.$('.js-board-desc').val().trim();
     if (newTitle) {
       this.rename(newTitle);
+      this.setDesciption(newDesc);
       Popup.close();
     }
     evt.preventDefault();
diff --git a/client/components/boards/boardsList.jade b/client/components/boards/boardsList.jade
index 464f9b97..7099cdc9 100644
--- a/client/components/boards/boardsList.jade
+++ b/client/components/boards/boardsList.jade
@@ -20,5 +20,6 @@ template(name="boardList")
                 i.fa.js-star-board(
                   class="fa-star{{#if isStarred}} is-star-active{{else}}-o{{/if}}"
                   title="{{_ 'star-board-title'}}")
+                p.board-list-item-desc= description
       li.js-add-board
         a.board-list-item.label {{_ 'add-board'}}
diff --git a/models/boards.js b/models/boards.js
index c10e51a3..6aba0b1e 100644
--- a/models/boards.js
+++ b/models/boards.js
@@ -71,6 +71,10 @@ Boards.attachSchema(new SimpleSchema({
       'midnight',
     ],
   },
+  description: {
+    type: String,
+    optional: true,
+  },
 }));
 
 
@@ -141,6 +145,10 @@ Boards.mutations({
     return { $set: { title }};
   },
 
+  setDesciption(description) {
+    return { $set: {description} };
+  },
+
   setColor(color) {
     return { $set: { color }};
   },
diff --git a/server/publications/boards.js b/server/publications/boards.js
index 4ab7a12e..814d1df8 100644
--- a/server/publications/boards.js
+++ b/server/publications/boards.js
@@ -25,6 +25,7 @@ Meteor.publish('boards', function() {
       archived: 1,
       slug: 1,
       title: 1,
+      description: 1,
       color: 1,
       members: 1,
       permission: 1,