Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-01-31 13:45:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'devel' into edge

Browse source
This commit is contained in:
Lauri Ojansivu 2019-02-27 16:26:48 +02:00
commit 4a77bc930f
14 changed files with 180 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

30
client/components/lists/listBody.jade
View file

@ -44,20 +44,19 @@ template(name="addCardForm")
.add-controls.clearfix
button.primary.confirm(type="submit") {{_ 'add'}}
unless isSandstorm
unless currentBoard.isTemplatesBoard
unless currentBoard.isTemplateBoard
span.quiet
| {{_ 'or'}}
a.js-link {{_ 'link'}}
span.quiet
|  
| /
a.js-search {{_ 'search'}}
span.quiet
|  
| /
a.js-card-template {{_ 'template'}}
unless currentBoard.isTemplatesBoard
unless currentBoard.isTemplateBoard
span.quiet
| {{_ 'or'}}
a.js-link {{_ 'link'}}
span.quiet
|  
| /
a.js-search {{_ 'search'}}
span.quiet
|  
| /
a.js-card-template {{_ 'template'}}
template(name="autocompleteLabelLine")
.minicard-label(class="card-label-{{colorName}}" title=labelName)
@ -88,8 +87,7 @@ template(name="linkCardPopup")
option(value="{{getId}}") {{getTitle}}
.edit-controls.clearfix
unless isSandstorm
input.primary.confirm.js-done(type="button" value="{{_ 'link'}}")
input.primary.confirm.js-done(type="button" value="{{_ 'link'}}")
template(name="searchElementPopup")
unless isTemplateSearch