diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-02-02 14:37:19 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-02-02 14:37:19 +0200 |
commit | 405514fd6beeca7f17a4e58bfa0c28756468a8e2 (patch) | |
tree | 16c4cabb43216e399c26b39132f98ce61ad59069 /client/components/swimlanes | |
parent | efa2d99bf40d0f0fd4d89d3001cbb60ee18e18ac (diff) | |
parent | 73401a5d749b25712823b08b2dda071c46009931 (diff) | |
download | wekan-405514fd6beeca7f17a4e58bfa0c28756468a8e2.tar.gz wekan-405514fd6beeca7f17a4e58bfa0c28756468a8e2.tar.bz2 wekan-405514fd6beeca7f17a4e58bfa0c28756468a8e2.zip |
Merge branch 'devel'
Diffstat (limited to 'client/components/swimlanes')
-rw-r--r-- | client/components/swimlanes/swimlaneHeader.jade | 23 | ||||
-rw-r--r-- | client/components/swimlanes/swimlaneHeader.js | 25 | ||||
-rw-r--r-- | client/components/swimlanes/swimlanes.jade | 5 | ||||
-rw-r--r-- | client/components/swimlanes/swimlanes.styl | 6 |
4 files changed, 54 insertions, 5 deletions
diff --git a/client/components/swimlanes/swimlaneHeader.jade b/client/components/swimlanes/swimlaneHeader.jade new file mode 100644 index 00000000..49193a81 --- /dev/null +++ b/client/components/swimlanes/swimlaneHeader.jade @@ -0,0 +1,23 @@ +template(name="swimlaneHeader") + .swimlane-header-wrap + +inlinedForm + +editSwimlaneTitleForm + else + .swimlane-header( + class="{{#if currentUser.isBoardMember}}js-open-inlined-form is-editable{{/if}}") + = title + .swimlane-header-menu + unless currentUser.isCommentOnly + a.fa.fa-navicon.js-open-swimlane-menu + +template(name="editSwimlaneTitleForm") + .list-composer + input.list-name-input.full-line(type="text" value=title autofocus) + .edit-controls.clearfix + button.primary.confirm(type="submit") {{_ 'save'}} + a.fa.fa-times-thin.js-close-inlined-form + +template(name="swimlaneActionPopup") + unless currentUser.isCommentOnly + ul.pop-over-list + li: a.js-close-swimlane {{_ 'archive-swimlane'}} diff --git a/client/components/swimlanes/swimlaneHeader.js b/client/components/swimlanes/swimlaneHeader.js new file mode 100644 index 00000000..50635f86 --- /dev/null +++ b/client/components/swimlanes/swimlaneHeader.js @@ -0,0 +1,25 @@ +BlazeComponent.extendComponent({ + editTitle(evt) { + evt.preventDefault(); + const newTitle = this.childComponents('inlinedForm')[0].getValue().trim(); + const swimlane = this.currentData(); + if (newTitle) { + swimlane.rename(newTitle.trim()); + } + }, + + events() { + return [{ + 'click .js-open-swimlane-menu': Popup.open('swimlaneAction'), + submit: this.editTitle, + }]; + }, +}).register('swimlaneHeader'); + +Template.swimlaneActionPopup.events({ + 'click .js-close-swimlane' (evt) { + evt.preventDefault(); + this.archive(); + Popup.close(); + }, +}); diff --git a/client/components/swimlanes/swimlanes.jade b/client/components/swimlanes/swimlanes.jade index 765f6d49..6fc24d4c 100644 --- a/client/components/swimlanes/swimlanes.jade +++ b/client/components/swimlanes/swimlanes.jade @@ -1,8 +1,6 @@ template(name="swimlane") .swimlane.js-lists - .swimlane-header-wrap - .swimlane-header - = title + +swimlaneHeader if isMiniScreen if currentList +list(currentList) @@ -17,7 +15,6 @@ template(name="swimlane") if currentCardIsInThisList _id ../_id +cardDetails(currentCard) if currentUser.isBoardMember - +addListForm +addListAndSwimlaneForm template(name="listsGroup") diff --git a/client/components/swimlanes/swimlanes.styl b/client/components/swimlanes/swimlanes.styl index 48bc495c..fcc5d962 100644 --- a/client/components/swimlanes/swimlanes.styl +++ b/client/components/swimlanes/swimlanes.styl @@ -2,7 +2,7 @@ .swimlane-header-wrap display: flex; - flex-direction: column; + flex-direction: row; flex: 0 0 50px; .swimlane-header @@ -18,3 +18,7 @@ text-overflow: ellipsis; word-wrap: break-word; text-align: center; + + .swimlane-header-menu + position: absolute + padding: 20px 20px |