Remove delete option from board hamburger menu

4 files changed, 5 insertions, 9 deletions

diff --git a/client/components/boards/boardArchive.jade b/client/components/boards/boardArchive.jade
index a9b1be85..29372b39 100644
--- a/client/components/boards/boardArchive.jade
+++ b/client/components/boards/boardArchive.jade
@@ -16,3 +16,6 @@ template(name="archivedBoards")
     else
       li.no-items-message {{_ 'no-archived-boards'}}
 
+template(name="deleteBoardPopup")
+  p {{_ 'delete-board-pop'}}
+  button.js-confirm.negate.full(type="submit") {{_ 'delete'}}
diff --git a/client/components/boards/boardArchive.js b/client/components/boards/boardArchive.js
index f31d7d86..dbebdd70 100644
--- a/client/components/boards/boardArchive.js
+++ b/client/components/boards/boardArchive.js
@@ -29,7 +29,7 @@ BlazeComponent.extendComponent({
         board.restore();
         Utils.goBoardId(board._id);
       },
-      'click .js-delete': Popup.afterConfirm('cardDelete', function() {
+      'click .js-delete-board': Popup.afterConfirm('boardDelete', function() {
         Popup.close();
         const isSandstorm = Meteor.settings && Meteor.settings.public &&
           Meteor.settings.public.sandstorm;
diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade
index b8801ac2..b4ccd3b3 100644
--- a/client/components/boards/boardHeader.jade
+++ b/client/components/boards/boardHeader.jade
@@ -129,7 +129,6 @@ template(name="boardMenuPopup")
       ul.pop-over-list
         li: a(href="{{exportUrl}}", download="{{exportFilename}}") {{_ 'export-board'}}
         li: a.js-archive-board {{_ 'archive-board'}}
-        li: a.js-delete-board {{_ 'delete-board'}}
         li: a.js-outgoing-webhooks {{_ 'outgoing-webhooks'}}
   if isSandstorm
     hr
@@ -238,12 +237,6 @@ template(name="archiveBoardPopup")
   p {{_ 'close-board-pop'}}
   button.js-confirm.negate.full(type="submit") {{_ 'archive'}}
 
-template(name="deleteBoardPopup")
-  p {{_ 'delete-board-pop'}}
-  unless archived
-    p {{_ 'board-delete-suggest-archive'}}
-  button.js-confirm.negate.full(type="submit") {{_ 'delete'}}
-
 template(name="outgoingWebhooksPopup")
   each integrations
     form.integration-form
diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade
index 0915c4bc..cc1b60dd 100644
--- a/client/components/cards/cardDetails.jade
+++ b/client/components/cards/cardDetails.jade
@@ -175,7 +175,7 @@ template(name="editCardTitleForm")
     a.fa.fa-times-thin.js-close-inlined-form
 
 template(name="editCardRequesterForm")
-  input.js-edit-card-requester(type='text' autofocus value=requestedBy )
+  input.js-edit-card-requester(type='text' autofocus value=requestedBy)
   .edit-controls.clearfix
     button.primary.confirm.js-submit-edit-card-requester-form(type="submit") {{_ 'save'}}
     a.fa.fa-times-thin.js-close-inlined-form