summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRJevnikar <12701645+rjevnikar@users.noreply.github.com>2018-06-07 16:02:44 +0000
committerRJevnikar <12701645+rjevnikar@users.noreply.github.com>2018-06-07 16:02:44 +0000
commitc72b769f826b510757179eedcf5013cc44dd63c2 (patch)
tree8a7f9b233b5f927cd9852ec72f8e6d4de1f055cd
parent8f364281d2632809b4650db3ba49939617b6ca09 (diff)
downloadwekan-c72b769f826b510757179eedcf5013cc44dd63c2.tar.gz
wekan-c72b769f826b510757179eedcf5013cc44dd63c2.tar.bz2
wekan-c72b769f826b510757179eedcf5013cc44dd63c2.zip
Attempt to lineup buttons in recycle bin & get delete board popup to appear
-rw-r--r--client/components/boards/boardArchive.jade17
-rw-r--r--i18n/en.i18n.json5
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"
}