From c72b769f826b510757179eedcf5013cc44dd63c2 Mon Sep 17 00:00:00 2001 From: RJevnikar <12701645+rjevnikar@users.noreply.github.com> Date: Thu, 7 Jun 2018 16:02:44 +0000 Subject: Attempt to lineup buttons in recycle bin & get delete board popup to appear --- client/components/boards/boardArchive.jade | 17 +++++++++-------- i18n/en.i18n.json | 5 ++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/components/boards/boardArchive.jade b/client/components/boards/boardArchive.jade index 29372b39..3008822c 100644 --- a/client/components/boards/boardArchive.jade +++ b/client/components/boards/boardArchive.jade @@ -6,16 +6,17 @@ template(name="archivedBoards") ul.archived-lists each archivedBoards li.archived-lists-item - button.js-restore-board - i.fa.fa-undo - | {{_ 'restore-board'}} - button.js-delete-board - i.fa.fa-trash-o - | {{_ 'delete-board'}} - = title + div.board-header-btns + button.board-header-btn.js-restore-board + i.fa.fa-undo + | {{_ 'restore-board'}} + button.board-header-btn.js-delete-board + i.fa.fa-trash-o + | {{_ 'delete-board'}} + = title else li.no-items-message {{_ 'no-archived-boards'}} -template(name="deleteBoardPopup") +template(name="boardDeletePopup") p {{_ 'delete-board-pop'}} button.js-confirm.negate.full(type="submit") {{_ 'delete'}} diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index f42d8fcc..f940f418 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -472,8 +472,7 @@ "assigned-by": "Assigned By", "requested-by": "Requested By", "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", - "board-delete-pop": "All lists, cards, labels, and activities will be removed and you won't be able to recover the board contents. There is no undo.", - "board-delete-suggest-archive": "You can archive a board to remove it from the the active boards and preserve the activity.", - "deleteBoardPopup": "Delete Board?", + "board-delete-pop": "All lists, cards, labels, and activities will be removed and you won't be able to recover the board contents. There is no undo.",, + "boardDeletePopup-title": "Delete Board?", "delete-board": "Delete Board" } -- cgit v1.2.3-1-g7c22