diff options
author | Xavier Priour <xavier.priour@bubblyware.com> | 2015-12-13 20:02:51 +0100 |
---|---|---|
committer | Xavier Priour <xavier.priour@bubblyware.com> | 2015-12-13 20:02:51 +0100 |
commit | e304185c23014fe3a4511d213535549e4bfeb207 (patch) | |
tree | 1e3a33f06db36b52f9bbfafb6163a652883a0cdf /client/components/boards | |
parent | 18697d45f652a119ba21b0cef42fbf732902bfa9 (diff) | |
parent | 0954cff5b470712210275a9c0699d85d6579ab54 (diff) | |
download | wekan-e304185c23014fe3a4511d213535549e4bfeb207.tar.gz wekan-e304185c23014fe3a4511d213535549e4bfeb207.tar.bz2 wekan-e304185c23014fe3a4511d213535549e4bfeb207.zip |
Merge remote-tracking branch 'upstream/devel' into devel
Diffstat (limited to 'client/components/boards')
-rw-r--r-- | client/components/boards/boardArchive.js | 2 | ||||
-rw-r--r-- | client/components/boards/boardHeader.jade | 4 | ||||
-rw-r--r-- | client/components/boards/boardHeader.js | 4 | ||||
-rw-r--r-- | client/components/boards/boardsList.jade | 9 |
4 files changed, 14 insertions, 5 deletions
diff --git a/client/components/boards/boardArchive.js b/client/components/boards/boardArchive.js index 35f795f3..6f62daaf 100644 --- a/client/components/boards/boardArchive.js +++ b/client/components/boards/boardArchive.js @@ -1,4 +1,4 @@ -Template.headerTitle.events({ +Template.boardHeaderBar.events({ 'click .js-open-archived-board'() { Modal.open('archivedBoards'); }, diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade index f264a6d9..eb7ca984 100644 --- a/client/components/boards/boardHeader.jade +++ b/client/components/boards/boardHeader.jade @@ -1,4 +1,4 @@ -template(name="headerBoard") +template(name="boardHeaderBar") h1.header-board-menu with currentBoard a(class="{{#if currentUser.isBoardAdmin}}js-edit-board-title{{else}}is-disabled{{/if}}") @@ -125,4 +125,4 @@ template(name="boardChangeTitlePopup") template(name="archiveBoardPopup") p {{_ 'close-board-pop'}} - button.js-confirm.negate.full(type="submit") {{_ 'close'}} + button.js-confirm.negate.full(type="submit") {{_ 'archive'}} diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js index 34204a46..b5a31754 100644 --- a/client/components/boards/boardHeader.js +++ b/client/components/boards/boardHeader.js @@ -50,7 +50,7 @@ Template.boardChangeTitlePopup.events({ BlazeComponent.extendComponent({ template() { - return 'headerBoard'; + return 'boardHeaderBar'; }, isStarred() { @@ -94,7 +94,7 @@ BlazeComponent.extendComponent({ }, }]; }, -}).register('headerBoard'); +}).register('boardHeaderBar'); BlazeComponent.extendComponent({ template() { diff --git a/client/components/boards/boardsList.jade b/client/components/boards/boardsList.jade index 7099cdc9..c11bb2df 100644 --- a/client/components/boards/boardsList.jade +++ b/client/components/boards/boardsList.jade @@ -23,3 +23,12 @@ template(name="boardList") p.board-list-item-desc= description li.js-add-board a.board-list-item.label {{_ 'add-board'}} + + +template(name="boardListHeaderBar") + h1 {{_ 'my-boards'}} + + .board-header-btns.right + a.board-header-btn.js-open-archived-board + i.fa.fa-archive + span {{_ 'archives'}} |