From 63a5bbafea58ffcf7b018d8e36569543c7dbe953 Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Sat, 19 Mar 2016 14:36:16 -0400 Subject: Show avatar on the cards --- app/Model/TaskFinder.php | 1 + app/Template/board/task_footer.php | 24 ++++++++++++++++++++++-- app/Template/board/task_menu.php | 2 +- app/Template/board/task_private.php | 20 +------------------- app/Template/board/task_public.php | 12 +----------- assets/css/app.css | 2 +- assets/css/print.css | 2 +- assets/css/src/avatar.css | 2 +- assets/css/src/task.css | 13 ++----------- assets/js/app.js | 2 +- assets/js/src/Board.js | 7 ++++++- 11 files changed, 38 insertions(+), 49 deletions(-) diff --git a/app/Model/TaskFinder.php b/app/Model/TaskFinder.php index 0492a9bf..d67372cc 100644 --- a/app/Model/TaskFinder.php +++ b/app/Model/TaskFinder.php @@ -127,6 +127,7 @@ class TaskFinder extends Base 'tasks.time_spent', User::TABLE.'.username AS assignee_username', User::TABLE.'.name AS assignee_name', + User::TABLE.'.email AS assignee_email', Category::TABLE.'.name AS category_name', Category::TABLE.'.description AS category_description', Column::TABLE.'.title AS column_name', diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php index cb1f1b0d..f5614f1d 100644 --- a/app/Template/board/task_footer.php +++ b/app/Template/board/task_footer.php @@ -18,6 +18,26 @@ + +
+ user->hasProjectAccess('taskmodification', 'edit', $task['project_id'])): ?> +
+ +
+ + avatar->small( + $task['owner_id'], + $task['assignee_username'], + $task['assignee_name'], + $task['assignee_email'], + 'avatar-inline' + ) ?> +
+
+ +
@@ -59,8 +79,6 @@ - - hook->render('template:board:task:footer', array('task' => $task)) ?> text->e($task['score']) ?> @@ -78,3 +96,5 @@ task->formatPriority($project, $task) ?>
+ +hook->render('template:board:task:footer', array('task' => $task)) ?> diff --git a/app/Template/board/task_menu.php b/app/Template/board/task_menu.php index ce9b7fa2..c0d97cda 100644 --- a/app/Template/board/task_menu.php +++ b/app/Template/board/task_menu.php @@ -1,5 +1,5 @@ - +