diff options
author | Lauri Ojansivu <x@xet7.org> | 2017-07-12 01:29:57 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2017-07-12 01:29:57 +0300 |
commit | 1aea465a23ccbc70301ba7bd2d544a3c1d9e0d29 (patch) | |
tree | 18043c74084e5e925583f49161bef1c2a78524fd /client/components/boards | |
parent | 61b2c91ffed53a616eeab0cee4e8b0c4eb7f764e (diff) | |
parent | b25436e1bf0c9085bd2f21ef1bc8b12c4f6b179e (diff) | |
download | wekan-1aea465a23ccbc70301ba7bd2d544a3c1d9e0d29.tar.gz wekan-1aea465a23ccbc70301ba7bd2d544a3c1d9e0d29.tar.bz2 wekan-1aea465a23ccbc70301ba7bd2d544a3c1d9e0d29.zip |
Merge branch 'GhassenRjab-devel' into devel
Import Wekan board. Thanks to GhassenRjab !
Diffstat (limited to 'client/components/boards')
-rw-r--r-- | client/components/boards/boardHeader.jade | 8 | ||||
-rw-r--r-- | client/components/boards/boardHeader.js | 7 |
2 files changed, 14 insertions, 1 deletions
diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade index e61aea35..a5b7face 100644 --- a/client/components/boards/boardHeader.jade +++ b/client/components/boards/boardHeader.jade @@ -191,8 +191,14 @@ template(name="createBoard") input.primary.wide(type="submit" value="{{_ 'create'}}") span.quiet | {{_ 'or'}} - a(href="{{pathFor 'import'}}") {{_ 'import-board'}} + a.js-import-board {{_ 'import-board'}} +template(name="chooseBoardSource") + ul.pop-over-list + li + a(href="{{pathFor 'import/trello'}}") {{_ 'from-trello'}} + li + a(href="{{pathFor 'import/wekan'}}") {{_ 'from-wekan'}} template(name="boardChangeTitlePopup") form diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js index 06defbfa..c8b44824 100644 --- a/client/components/boards/boardHeader.js +++ b/client/components/boards/boardHeader.js @@ -174,10 +174,17 @@ const CreateBoard = BlazeComponent.extendComponent({ 'click .js-change-visibility': this.toggleVisibilityMenu, 'click .js-import': Popup.open('boardImportBoard'), submit: this.onSubmit, + 'click .js-import-board': Popup.open('chooseBoardSource'), }]; }, }).register('createBoardPopup'); +BlazeComponent.extendComponent({ + template() { + return 'chooseBoardSource'; + }, +}).register('chooseBoardSourcePopup'); + (class HeaderBarCreateBoard extends CreateBoard { onSubmit(evt) { super.onSubmit(evt); |