Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-02-04 23:51:48 +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

18
client/components/cards/cardDetails.jade
View file

@ -19,16 +19,14 @@ template(name="cardDetails")
a.js-parent-card(href=linkForCard) {{title}}
// else
{{_ 'top-level-card'}}
unless isSandstorm
if isLinkedCard
h3.linked-card-location
+viewer
| {{getBoardTitle}} > {{getTitle}}
if isLinkedCard
h3.linked-card-location
+viewer
| {{getBoardTitle}} > {{getTitle}}
if getArchived
if isLinkedBoard
unless isSandstorm
p.warning {{_ 'board-archived'}}
p.warning {{_ 'board-archived'}}
else
p.warning {{_ 'card-archived'}}
@ -192,11 +190,9 @@ template(name="cardDetails")
unless currentUser.isNoComments
if isLoaded.get
if isLinkedCard
unless isSandstorm
+activities(card=this mode="linkedcard")
+activities(card=this mode="linkedcard")
else if isLinkedBoard
unless isSandstorm
+activities(card=this mode="linkedboard")
+activities(card=this mode="linkedboard")
else
+activities(card=this mode="card")