Merge branch 'edge' into meteor-1.8

3 files changed, 74 insertions, 6 deletions

diff --git a/client/components/sidebar/sidebarArchives.jade b/client/components/sidebar/sidebarArchives.jade
index ee6cac01..e2f3e395 100644
--- a/client/components/sidebar/sidebarArchives.jade
+++ b/client/components/sidebar/sidebarArchives.jade
@@ -2,6 +2,10 @@ template(name="archivesSidebar")
   +basicTabs(tabs=tabs)
 
    +tabContent(slug="cards")
+    p.quiet
+      a.js-restore-all-cards {{_ 'restore-all'}}
+      | -
+      a.js-delete-all-cards {{_ 'delete-all'}}
     each archivedCards
       .minicard-wrapper.js-minicard
         +minicard(this)
@@ -16,23 +20,35 @@ template(name="archivesSidebar")
       p.no-items-message {{_ 'no-archived-cards'}}
 
    +tabContent(slug="lists")
+    p.quiet
+      a.js-restore-all-lists {{_ 'restore-all'}}
+      | -
+      a.js-delete-all-lists {{_ 'delete-all'}}
     ul.archived-lists
       each archivedLists
         li.archived-lists-item
-          if currentUser.isBoardMember
-            button.js-restore-list
-              i.fa.fa-undo
           = title
+          if currentUser.isBoardMember
+            p.quiet
+              a.js-restore-list {{_ 'restore'}}
+              | -
+              a.js-delete-list {{_ 'delete'}}
       else
         li.no-items-message {{_ 'no-archived-lists'}}
 
    +tabContent(slug="swimlanes")
+    p.quiet
+      a.js-restore-all-swimlanes {{_ 'restore-all'}}
+      | -
+      a.js-delete-all-swimlanes {{_ 'delete-all'}}
     ul.archived-lists
       each archivedSwimlanes
         li.archived-lists-item
-          if currentUser.isBoardMember
-            button.js-restore-swimlane
-              i.fa.fa-undo
           = title
+          if currentUser.isBoardMember
+            p.quiet
+              a.js-restore-swimlane {{_ 'restore'}}
+              | -
+              a.js-delete-swimlane {{_ 'delete'}}
       else
         li.no-items-message {{_ 'no-archived-swimlanes'}}
diff --git a/client/components/sidebar/sidebarArchives.js b/client/components/sidebar/sidebarArchives.js
index 6102bf11..b50043fd 100644
--- a/client/components/sidebar/sidebarArchives.js
+++ b/client/components/sidebar/sidebarArchives.js
@@ -44,19 +44,67 @@ BlazeComponent.extendComponent({
           card.restore();
         }
       },
+      'click .js-restore-all-cards'() {
+        this.archivedCards().forEach((card) => {
+          if(card.canBeRestored()){
+            card.restore();
+          }
+        });
+      },
+
       'click .js-delete-card': Popup.afterConfirm('cardDelete', function() {
         const cardId = this._id;
         Cards.remove(cardId);
         Popup.close();
       }),
+      'click .js-delete-all-cards': Popup.afterConfirm('cardDelete', () => {
+        this.archivedCards().forEach((card) => {
+          Cards.remove(card._id);
+        });
+        Popup.close();
+      }),
+
       'click .js-restore-list'() {
         const list = this.currentData();
         list.restore();
       },
+      'click .js-restore-all-lists'() {
+        this.archivedLists().forEach((list) => {
+          list.restore();
+        });
+      },
+
+      'click .js-delete-list': Popup.afterConfirm('listDelete', function() {
+        this.remove();
+        Popup.close();
+      }),
+      'click .js-delete-all-lists': Popup.afterConfirm('listDelete', () => {
+        this.archivedLists().forEach((list) => {
+          list.remove();
+        });
+        Popup.close();
+      }),
+
       'click .js-restore-swimlane'() {
         const swimlane = this.currentData();
         swimlane.restore();
       },
+      'click .js-restore-all-swimlanes'() {
+        this.archivedSwimlanes().forEach((swimlane) => {
+          swimlane.restore();
+        });
+      },
+
+      'click .js-delete-swimlane': Popup.afterConfirm('swimlaneDelete', function() {
+        this.remove();
+        Popup.close();
+      }),
+      'click .js-delete-all-swimlanes': Popup.afterConfirm('swimlaneDelete', () => {
+        this.archivedSwimlanes().forEach((swimlane) => {
+          swimlane.remove();
+        });
+        Popup.close();
+      }),
     }];
   },
 }).register('archivesSidebar');
diff --git a/client/components/swimlanes/swimlaneHeader.jade b/client/components/swimlanes/swimlaneHeader.jade
index de9621d5..8c6aa5a3 100644
--- a/client/components/swimlanes/swimlaneHeader.jade
+++ b/client/components/swimlanes/swimlaneHeader.jade
@@ -54,3 +54,7 @@ template(name="setSwimlaneColorPopup")
           i.fa.fa-check
     button.primary.confirm.js-submit {{_ 'save'}}
     button.js-remove-color.negate.wide.right {{_ 'unset-color'}}
+
+template(name="swimlaneDeletePopup")
+  p {{_ "swimlane-delete-pop"}}
+  button.js-confirm.negate.full(type="submit") {{_ 'delete'}}