6 files changed, 86 insertions, 86 deletions
diff --git a/client/components/lists/list.styl b/client/components/lists/list.styl
index 40e5ea94..2145d947 100644
--- a/client/components/lists/list.styl
+++ b/client/components/lists/list.styl
@@ -77,8 +77,9 @@
 
   .list-header-menu-icon
     position: absolute
-    top: 0
-    right: 0
+    padding: 7px
+    top: -@padding
+    right: -@padding
 
 .list-body
   flex: 1
diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade
index 288cfd57..00b574da 100644
--- a/client/components/lists/listHeader.jade
+++ b/client/components/lists/listHeader.jade
@@ -14,3 +14,30 @@ template(name="editListTitleForm")
     .edit-controls.clearfix
       button.primary.confirm(type="submit") {{_ 'save'}}
       a.fa.fa-times-thin.js-close-inlined-form
+
+template(name="listActionPopup")
+  ul.pop-over-list
+    li: a.js-add-card {{_ 'add-card'}}
+    if cards.count
+      li: a.js-select-cards {{_ 'list-select-cards'}}
+      li: a.js-move-cards {{_ 'list-move-cards'}}
+      li: a.js-archive-cards {{_ 'list-archive-cards'}}
+  hr
+  ul.pop-over-list
+    li: a.js-close-list {{_ 'archive-list'}}
+
+template(name="listMoveCardsPopup")
+  +boardLists
+
+template(name="boardLists")
+  ul.pop-over-list
+    each currentBoard.lists
+      li
+        if($eq ../_id _id)
+          a.disabled {{title}} ({{_ 'current'}})
+        else
+          a.js-select-list= title
+
+template(name="listArchiveCardsPopup")
+  p {{_ 'list-archive-cards-pop'}}
+  input.js-confirm.negate.full(type="submit" value="{{_ 'archive-all'}}")
diff --git a/client/components/lists/listHeader.js b/client/components/lists/listHeader.js
index 014cfd80..cd4df276 100644
--- a/client/components/lists/listHeader.js
+++ b/client/components/lists/listHeader.js
@@ -23,3 +23,56 @@ BlazeComponent.extendComponent({
     }];
   }
 }).register('listHeader');
+
+Template.listActionPopup.events({
+  'click .js-add-card': function() {
+    var listDom = document.getElementById('js-list-' + this._id);
+    var listComponent = BlazeComponent.getComponentForElement(listDom);
+    listComponent.openForm({ position: 'top' });
+    Popup.close();
+  },
+  'click .js-list-subscribe': function() {},
+  'click .js-select-cards': function() {
+    var cardIds = Cards.find(
+      {listId: this._id},
+      {fields: { _id: 1 }}
+    ).map(function(card) { return card._id; });
+    MultiSelection.add(cardIds);
+    Popup.close();
+  },
+  'click .js-move-cards': Popup.open('listMoveCards'),
+  'click .js-archive-cards': Popup.afterConfirm('listArchiveCards', function() {
+    Cards.find({listId: this._id}).forEach(function(card) {
+      Cards.update(card._id, {
+        $set: {
+          archived: true
+        }
+      });
+    });
+    Popup.close();
+  }),
+  'click .js-close-list': function(evt) {
+    evt.preventDefault();
+    Lists.update(this._id, {
+      $set: {
+        archived: true
+      }
+    });
+    Popup.close();
+  }
+});
+
+Template.listMoveCardsPopup.events({
+  'click .js-select-list': function() {
+    var fromList = Template.parentData(2).data._id;
+    var toList = this._id;
+    Cards.find({listId: fromList}).forEach(function(card) {
+      Cards.update(card._id, {
+        $set: {
+          listId: toList
+        }
+      });
+    });
+    Popup.close();
+  }
+});
diff --git a/client/components/lists/listMenu.jade b/client/components/lists/listMenu.jade
deleted file mode 100644
index 052f064c..00000000
--- a/client/components/lists/listMenu.jade
+++ /dev/null
@@ -1,29 +0,0 @@
-template(name="listActionPopup")
-  ul.pop-over-list
-    li: a.js-add-card {{_ 'add-card'}}
-    li: a.highlight-icon.js-list-subscribe {{_ 'subscribe'}}
-  if cards.count
-    hr
-    ul.pop-over-list
-      li: a.js-select-cards {{_ 'list-select-cards'}}
-      li: a.js-move-cards {{_ 'list-move-cards'}}
-      li: a.js-archive-cards {{_ 'list-archive-cards'}}
-  hr
-  ul.pop-over-list
-    li: a.js-close-list {{_ 'archive-list'}}
-
-template(name="listMoveCardsPopup")
-  +boardLists
-
-template(name="boardLists")
-  ul.pop-over-list
-    each currentBoard.lists
-      li
-        if($eq ../_id _id)
-          a.disabled {{title}} ({{_ 'current'}})
-        else
-          a.js-select-list= title
-
-template(name="listArchiveCardsPopup")
-  p {{_ 'list-archive-cards-pop'}}
-  input.js-confirm.negate.full(type="submit" value="{{_ 'archive-all'}}")
diff --git a/client/components/lists/listMenu.js b/client/components/lists/listMenu.js
deleted file mode 100644
index dda1270c..00000000
--- a/client/components/lists/listMenu.js
+++ /dev/null
@@ -1,52 +0,0 @@
-Template.listActionPopup.events({
-  'click .js-add-card': function() {
-    var listDom = document.getElementById('js-list-' + this._id);
-    var listComponent = BlazeComponent.getComponentForElement(listDom);
-    listComponent.openForm({ position: 'top' });
-    Popup.close();
-  },
-  'click .js-list-subscribe': function() {},
-  'click .js-select-cards': function() {
-    var cardIds = Cards.find(
-      {listId: this._id},
-      {fields: { _id: 1 }}
-    ).map(function(card) { return card._id; });
-    MultiSelection.add(cardIds);
-    Popup.close();
-  },
-  'click .js-move-cards': Popup.open('listMoveCards'),
-  'click .js-archive-cards': Popup.afterConfirm('listArchiveCards', function() {
-    Cards.find({listId: this._id}).forEach(function(card) {
-      Cards.update(card._id, {
-        $set: {
-          archived: true
-        }
-      });
-    });
-    Popup.close();
-  }),
-  'click .js-close-list': function(evt) {
-    evt.preventDefault();
-    Lists.update(this._id, {
-      $set: {
-        archived: true
-      }
-    });
-    Popup.close();
-  }
-});
-
-Template.listMoveCardsPopup.events({
-  'click .js-select-list': function() {
-    var fromList = Template.parentData(2).data._id;
-    var toList = this._id;
-    Cards.find({listId: fromList}).forEach(function(card) {
-      Cards.update(card._id, {
-        $set: {
-          listId: toList
-        }
-      });
-    });
-    Popup.close();
-  }
-});
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index e99d8ec0..ca1edfdc 100644
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -99,9 +99,9 @@
     "language": "Language",
     "leave-board": "Leave Board…",
     "link-card": "Link to this card",
-    "list-move-cards": "Move All Cards in This List…",
-    "list-select-cards": "Select All Cards in This List",
-    "list-archive-cards": "Archive All Cards in This List…",
+    "list-move-cards": "Move all cards in this list…",
+    "list-select-cards": "Select all cards in this list",
+    "list-archive-cards": "Archive all cards in this list…",
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view archived cards and bring them back to the board, click “Menu” > “Archived Items”.",
     "log-in": "Log In",
     "loginPopup-title": "Log In",