From fa86542f90774d7a7d8f3e81ee35821ca25b7fd4 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Fri, 18 Mar 2016 23:06:32 -0400
Subject: Added pluggable Avatar providers

---
 app/Template/comment/show.php               |  4 +---
 app/Template/event/comment_create.php       |  2 --
 app/Template/event/comment_update.php       |  2 --
 app/Template/event/events.php               | 11 ++++++++++-
 app/Template/event/subtask_create.php       |  2 --
 app/Template/event/subtask_update.php       |  2 --
 app/Template/event/task_assignee_change.php |  2 --
 app/Template/event/task_close.php           |  2 --
 app/Template/event/task_create.php          |  2 --
 app/Template/event/task_file_create.php     |  2 --
 app/Template/event/task_move_column.php     |  2 --
 app/Template/event/task_move_position.php   |  2 --
 app/Template/event/task_move_swimlane.php   |  2 --
 app/Template/event/task_open.php            |  2 --
 app/Template/event/task_update.php          |  2 --
 15 files changed, 11 insertions(+), 30 deletions(-)

(limited to 'app/Template')

diff --git a/app/Template/comment/show.php b/app/Template/comment/show.php
index 873e1470..c5963666 100644
--- a/app/Template/comment/show.php
+++ b/app/Template/comment/show.php
@@ -1,9 +1,7 @@
 <div class="comment <?= isset($preview) ? 'comment-preview' : '' ?>" id="comment-<?= $comment['id'] ?>">
 
     <p class="comment-title">
-        <?php if (! empty($comment['email'])): ?>
-            <?= $this->user->avatar($comment['email'], $comment['name'] ?: $comment['username']) ?>
-        <?php endif ?>
+        <?= $this->user->avatar($comment['user_id'], $comment['username'], $comment['name'], $comment['email']) ?>
 
         <?php if (! empty($comment['username'])): ?>
             <span class="comment-username"><?= $this->text->e($comment['name'] ?: $comment['username']) ?></span> @
diff --git a/app/Template/event/comment_create.php b/app/Template/event/comment_create.php
index 063736b3..43c521cf 100644
--- a/app/Template/event/comment_create.php
+++ b/app/Template/event/comment_create.php
@@ -1,5 +1,3 @@
-<?= $this->user->avatar($email, $author) ?>
-
 <p class="activity-title">
     <?= e('%s commented the task %s',
             $this->text->e($author),
diff --git a/app/Template/event/comment_update.php b/app/Template/event/comment_update.php
index 93f24d8a..80a33031 100644
--- a/app/Template/event/comment_update.php
+++ b/app/Template/event/comment_update.php
@@ -1,5 +1,3 @@
-<?= $this->user->avatar($email, $author) ?>
-
 <p class="activity-title">
     <?= e('%s updated a comment on the task %s',
             $this->text->e($author),
diff --git a/app/Template/event/events.php b/app/Template/event/events.php
index bbb01be4..097da318 100644
--- a/app/Template/event/events.php
+++ b/app/Template/event/events.php
@@ -16,7 +16,16 @@
                 <?php endif ?>
                 &nbsp;<?= $this->dt->datetime($event['date_creation']) ?>
             </p>
-            <div class="activity-content"><?= $event['event_content'] ?></div>
+            <div class="activity-content">
+                <?= $this->user->avatar(
+                    $event['creator_id'],
+                    $event['author_username'],
+                    $event['author_name'],
+                    $event['email']
+                ) ?>
+
+                <?= $event['event_content'] ?>
+            </div>
         </div>
     <?php endforeach ?>
 
diff --git a/app/Template/event/subtask_create.php b/app/Template/event/subtask_create.php
index 532783d5..ae6ddd44 100644
--- a/app/Template/event/subtask_create.php
+++ b/app/Template/event/subtask_create.php
@@ -1,5 +1,3 @@
-<?= $this->user->avatar($email, $author) ?>
-
 <p class="activity-title">
     <?= e('%s created a subtask for the task %s',
             $this->text->e($author),
diff --git a/app/Template/event/subtask_update.php b/app/Template/event/subtask_update.php
index e9ff6ac6..1d560fb0 100644
--- a/app/Template/event/subtask_update.php
+++ b/app/Template/event/subtask_update.php
@@ -1,5 +1,3 @@
-<?= $this->user->avatar($email, $author) ?>
-
 <p class="activity-title">
     <?= e('%s updated a subtask for the task %s',
             $this->text->e($author),
diff --git a/app/Template/event/task_assignee_change.php b/app/Template/event/task_assignee_change.php
index 580176c7..6964a50e 100644
--- a/app/Template/event/task_assignee_change.php
+++ b/app/Template/event/task_assignee_change.php
@@ -1,5 +1,3 @@
-<?= $this->user->avatar($email, $author) ?>
-
 <p class="activity-title">
     <?php $assignee = $task['assignee_name'] ?: $task['assignee_username'] ?>
 
diff --git a/app/Template/event/task_close.php b/app/Template/event/task_close.php
index 361458d3..2ba77156 100644
--- a/app/Template/event/task_close.php
+++ b/app/Template/event/task_close.php
@@ -1,5 +1,3 @@
-<?= $this->user->avatar($email, $author) ?>
-
 <p class="activity-title">
     <?= e('%s closed the task %s',
             $this->text->e($author),
diff --git a/app/Template/event/task_create.php b/app/Template/event/task_create.php
index 655bf8f3..21facc9e 100644
--- a/app/Template/event/task_create.php
+++ b/app/Template/event/task_create.php
@@ -1,5 +1,3 @@
-<?= $this->user->avatar($email, $author) ?>
-
 <p class="activity-title">
     <?= e('%s created the task %s',
             $this->text->e($author),
diff --git a/app/Template/event/task_file_create.php b/app/Template/event/task_file_create.php
index 61bf3d61..837f5dc0 100644
--- a/app/Template/event/task_file_create.php
+++ b/app/Template/event/task_file_create.php
@@ -1,5 +1,3 @@
-<?= $this->user->avatar($email, $author) ?>
-
 <p class="activity-title">
     <?= e('%s attached a new file to the task %s',
             $this->text->e($author),
diff --git a/app/Template/event/task_move_column.php b/app/Template/event/task_move_column.php
index 904c956c..b9ae65cc 100644
--- a/app/Template/event/task_move_column.php
+++ b/app/Template/event/task_move_column.php
@@ -1,5 +1,3 @@
-<?= $this->user->avatar($email, $author) ?>
-
 <p class="activity-title">
     <?= e('%s moved the task %s to the column "%s"',
             $this->text->e($author),
diff --git a/app/Template/event/task_move_position.php b/app/Template/event/task_move_position.php
index 6580bb79..dbe73f4b 100644
--- a/app/Template/event/task_move_position.php
+++ b/app/Template/event/task_move_position.php
@@ -1,5 +1,3 @@
-<?= $this->user->avatar($email, $author) ?>
-
 <p class="activity-title">
     <?= e('%s moved the task %s to the position #%d in the column "%s"',
             $this->text->e($author),
diff --git a/app/Template/event/task_move_swimlane.php b/app/Template/event/task_move_swimlane.php
index 9ffa554c..b0635a06 100644
--- a/app/Template/event/task_move_swimlane.php
+++ b/app/Template/event/task_move_swimlane.php
@@ -1,5 +1,3 @@
-<?= $this->user->avatar($email, $author) ?>
-
 <p class="activity-title">
     <?php if ($task['swimlane_id'] == 0): ?>
         <?= e('%s moved the task %s to the first swimlane',
diff --git a/app/Template/event/task_open.php b/app/Template/event/task_open.php
index 9db2e3c9..ce92bb18 100644
--- a/app/Template/event/task_open.php
+++ b/app/Template/event/task_open.php
@@ -1,5 +1,3 @@
-<?= $this->user->avatar($email, $author) ?>
-
 <p class="activity-title">
     <?= e('%s opened the task %s',
             $this->text->e($author),
diff --git a/app/Template/event/task_update.php b/app/Template/event/task_update.php
index 72d70495..83f1661b 100644
--- a/app/Template/event/task_update.php
+++ b/app/Template/event/task_update.php
@@ -1,5 +1,3 @@
-<?= $this->user->avatar($email, $author) ?>
-
 <p class="activity-title">
     <?= e('%s updated the task %s',
             $this->text->e($author),
-- 
cgit v1.2.3