浏览代码

Attempt to lineup buttons in recycle bin & get delete board popup to appear

RJevnikar 7 年之前
父节点
当前提交
c72b769f82
共有 2 个文件被更改,包括 11 次插入11 次删除
  1. 9 8
      client/components/boards/boardArchive.jade
  2. 2 3
      i18n/en.i18n.json

+ 9 - 8
client/components/boards/boardArchive.jade

@@ -6,16 +6,17 @@ template(name="archivedBoards")
   ul.archived-lists
   ul.archived-lists
     each archivedBoards
     each archivedBoards
       li.archived-lists-item
       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
     else
       li.no-items-message {{_ 'no-archived-boards'}}
       li.no-items-message {{_ 'no-archived-boards'}}
 
 
-template(name="deleteBoardPopup")
+template(name="boardDeletePopup")
   p {{_ 'delete-board-pop'}}
   p {{_ 'delete-board-pop'}}
   button.js-confirm.negate.full(type="submit") {{_ 'delete'}}
   button.js-confirm.negate.full(type="submit") {{_ 'delete'}}

+ 2 - 3
i18n/en.i18n.json

@@ -472,8 +472,7 @@
     "assigned-by": "Assigned By",
     "assigned-by": "Assigned By",
     "requested-by": "Requested 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-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"
     "delete-board": "Delete Board"
 }
 }