diff options
| author | Maxime Quandalle <maxime@quandalle.com> | 2015-10-20 20:06:26 +0200 |
|---|---|---|
| committer | Maxime Quandalle <maxime@quandalle.com> | 2015-10-20 20:06:26 +0200 |
| commit | 7a5f030cc807c6a0a5addd8da59dc853dd4bd426 (patch) | |
| tree | 784e5197277b8971eced858e1be9efb88b973cfd /client/components/boards | |
| parent | f3fc154eb0cf25c46871510a0d4004037188ec15 (diff) | |
| parent | 118b434a5aad35df8eefea85624ab9abafab56f0 (diff) | |
| download | wekan-7a5f030cc807c6a0a5addd8da59dc853dd4bd426.tar.gz wekan-7a5f030cc807c6a0a5addd8da59dc853dd4bd426.tar.bz2 wekan-7a5f030cc807c6a0a5addd8da59dc853dd4bd426.zip | |
Merge branch 'xavierpriour-devel' into devel
Conflicts:
models/import.js
Diffstat (limited to 'client/components/boards')
| -rw-r--r-- | client/components/boards/boardHeader.jade | 3 | ||||
| -rw-r--r-- | client/components/boards/boardHeader.js | 1 | ||||
| -rw-r--r-- | client/components/boards/boardHeader.styl | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade index ffc79143..cb86e9bb 100644 --- a/client/components/boards/boardHeader.jade +++ b/client/components/boards/boardHeader.jade @@ -107,6 +107,9 @@ template(name="createBoardPopup") | {{{_ 'board-private-info'}}} a.js-change-visibility {{_ 'change'}}. input.primary.wide(type="submit" value="{{_ 'create'}}") + span.quiet + | {{_ 'or'}} + a.js-import {{_ 'import-board'}} template(name="boardChangeTitlePopup") diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js index dbd76895..92d5f6d4 100644 --- a/client/components/boards/boardHeader.js +++ b/client/components/boards/boardHeader.js @@ -145,6 +145,7 @@ BlazeComponent.extendComponent({ this.setVisibility(this.currentData()); }, 'click .js-change-visibility': this.toggleVisibilityMenu, + 'click .js-import': Popup.open('boardImportBoard'), submit: this.onSubmit, }]; }, diff --git a/client/components/boards/boardHeader.styl b/client/components/boards/boardHeader.styl new file mode 100644 index 00000000..adfe4b19 --- /dev/null +++ b/client/components/boards/boardHeader.styl @@ -0,0 +1,2 @@ +a.js-import + text-decoration underline |