diff options
| author | Lauri Ojansivu <x@xet7.org> | 2019-02-27 21:03:54 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2019-02-27 21:03:54 +0200 |
| commit | 82a728df7111413e4a1b106f4cd18265da5f397b (patch) | |
| tree | 103291d880fcd494c115b216616a4e90bbff0832 /client/components/swimlanes/swimlanes.jade | |
| parent | 3f067c793cba98df663fb7646d5d3aafc79efe09 (diff) | |
| parent | 904b5bf0f5f6e36131bf2d081a5d08fef408ac81 (diff) | |
| download | wekan-82a728df7111413e4a1b106f4cd18265da5f397b.tar.gz wekan-82a728df7111413e4a1b106f4cd18265da5f397b.tar.bz2 wekan-82a728df7111413e4a1b106f4cd18265da5f397b.zip | |
Merge branch 'edge' into meteor-1.8
Diffstat (limited to 'client/components/swimlanes/swimlanes.jade')
| -rw-r--r-- | client/components/swimlanes/swimlanes.jade | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/client/components/swimlanes/swimlanes.jade b/client/components/swimlanes/swimlanes.jade index 34177a02..c56834df 100644 --- a/client/components/swimlanes/swimlanes.jade +++ b/client/components/swimlanes/swimlanes.jade @@ -3,15 +3,15 @@ template(name="swimlane") +swimlaneHeader .swimlane.js-lists.js-swimlane if isMiniScreen - if currentList + if currentListIsInThisSwimlane _id +list(currentList) - else - each currentBoard.lists + unless currentList + each lists +miniList(this) if currentUser.isBoardMember +addListForm else - each currentBoard.lists + each lists +list(this) if currentCardIsInThisList _id ../_id +cardDetails(currentCard) @@ -24,12 +24,12 @@ template(name="listsGroup") if currentList +list(currentList) else - each currentBoard.lists + each lists +miniList(this) if currentUser.isBoardMember +addListForm else - each currentBoard.lists + each lists +list(this) if currentCardIsInThisList _id null +cardDetails(currentCard) @@ -44,7 +44,11 @@ template(name="addListForm") autocomplete="off" autofocus) .edit-controls.clearfix button.primary.confirm(type="submit") {{_ 'save'}} - a.fa.fa-times-thin.js-close-inlined-form + unless currentBoard.isTemplatesBoard + unless currentBoard.isTemplateBoard + span.quiet + | {{_ 'or'}} + a.js-list-template {{_ 'template'}} else a.open-list-composer.js-open-inlined-form i.fa.fa-plus |