taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1149 from taigaio/show-kanban-and-taskboard-icons-when-is-relevant 

Show icons on kanban and taskboard only when is relevant
stable
Xaviju 2017-01-18 13:19:11 +01:00 committed by GitHub
parent bcffb14ff1 204f102696
commit 6d2a3c8048
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/modules/components/card/card-templates/card-data.jade
View File

@ -3,7 +3,7 @@
ng-class="{'empty-tasks': !vm.item.getIn(['model', 'tasks']).size}" ng-class="{'empty-tasks': !vm.item.getIn(['model', 'tasks']).size}"
) )
span.card-estimation( span.card-estimation(
ng-if="vm.item.getIn(['model', 'total_points']) === null", ng-if="vm.item.getIn(['model', 'total_points']) === null && vm.visible('empty_extra_info')",
translate="US.NOT_ESTIMATED" translate="US.NOT_ESTIMATED"
) )
span.card-estimation( span.card-estimation(
@ -17,12 +17,18 @@
tg-svg( tg-svg(
svg-icon="icon-iocaine" svg-icon="icon-iocaine"
) )
.statistic.card-votes(ng-class="{'active': vm.item.getIn(['model', 'is_voter'])}") .statistic.card-votes(
ng-class="{'active': vm.item.getIn(['model', 'is_voter'])}"
ng-if="vm.item.getIn(['model', 'total_voters']) || vm.visible('empty_extra_info')"
)
tg-svg(svg-icon="icon-upvote") tg-svg(svg-icon="icon-upvote")
span {{vm.item.getIn(['model', 'total_voters'])}} span {{vm.item.getIn(['model', 'total_voters'])}}
.statistic.card-watchers .statistic.card-watchers(ng-if="vm.item.getIn(['model', 'watchers']).size || vm.visible('empty_extra_info')")
tg-svg(svg-icon="icon-watch") tg-svg(svg-icon="icon-watch")
span {{vm.item.getIn(['model', 'watchers']).size}} span {{vm.item.getIn(['model', 'watchers']).size}}
.statistic.card-attachments(ng-if="vm.item.getIn(['model', 'attachments']).size") .statistic.card-comments(ng-if="vm.item.getIn(['model', 'total_comments']) || vm.visible('empty_extra_info')")
tg-svg(svg-icon="icon-bubble-empty")
span {{vm.item.getIn(['model', 'total_comments'])}}
.statistic.card-attachments(ng-if="vm.item.getIn(['model', 'attachments']).size || vm.visible('empty_extra_info')")
tg-svg(svg-icon="icon-attachment") tg-svg(svg-icon="icon-attachment")
span {{vm.item.getIn(['model', 'attachments']).size}} span {{vm.item.getIn(['model', 'attachments']).size}}

2
app/modules/components/kanban-board-zoom/kanban-board-zoom.directive.coffee
View File

@ -27,7 +27,7 @@ KanbanBoardZoomDirective = (storage, projectService) ->
["subject"], ["subject"],
["owner", "tags", "extra_info", "unfold"], ["owner", "tags", "extra_info", "unfold"],
["attachments"], ["attachments"],
["related_tasks"] ["related_tasks", "empty_extra_info"]
] ]
getZoomView = (zoomIndex = 0) -> getZoomView = (zoomIndex = 0) ->

2
app/modules/components/taskboard-zoom/taskboard-zoom.directive.coffee
View File

@ -27,7 +27,7 @@ TaskboardZoomDirective = (storage) ->
["ref"], ["ref"],
["subject"], ["subject"],
["owner", "tags", "extra_info", "unfold"], ["owner", "tags", "extra_info", "unfold"],
["attachments"], ["attachments", "empty_extra_info"],
["related_tasks"] ["related_tasks"]
] ]