Handle multiple avatar sizes

2 files changed, 65 insertions, 22 deletions

diff --git a/app/Helper/AvatarHelper.php b/app/Helper/AvatarHelper.php
new file mode 100644
index 00000000..c4e27ed9
--- /dev/null
+++ b/app/Helper/AvatarHelper.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Kanboard\Helper;
+
+use Kanboard\Core\Base;
+
+/**
+ * Avatar Helper
+ *
+ * @package helper
+ * @author  Frederic Guillot
+ */
+class AvatarHelper extends Base
+{
+    /**
+     * Render user avatar
+     *
+     * @access public
+     * @param  string  $user_id
+     * @param  string  $username
+     * @param  string  $name
+     * @param  string  $email
+     * @param  string  $css
+     * @param  int     $size
+     * @return string
+     */
+    public function render($user_id, $username, $name, $email, $css = 'avatar-left', $size = 48)
+    {
+        if (empty($user_id) && empty($username)) {
+            $html = $this->avatarManager->renderDefault($size);
+        } else {
+            $html = $this->avatarManager->render($user_id, $username, $name, $email, $size);
+        }
+
+        return '<div class="avatar avatar-'.$size.' '.$css.'">'.$html.'</div>';
+    }
+
+    /**
+     * Render small user avatar
+     *
+     * @access public
+     * @param  string   $user_id
+     * @param  string   $username
+     * @param  string   $name
+     * @param  string   $email
+     * @return string
+     */
+    public function small($user_id, $username, $name, $email, $css = '')
+    {
+        return $this->render($user_id, $username, $name, $email, $css, 20);
+    }
+
+    /**
+     * Get a small avatar for the current user
+     *
+     * @access public
+     * @return string
+     */
+    public function currentUserSmall($css = '')
+    {
+        $user = $this->userSession->getAll();
+        return $this->small($user['id'], $user['username'], $user['name'], $user['email'], $css);
+    }
+}
diff --git a/app/Helper/UserHelper.php b/app/Helper/UserHelper.php
index c60c35c2..ee7d8ba5 100644
--- a/app/Helper/UserHelper.php
+++ b/app/Helper/UserHelper.php
@@ -156,27 +156,6 @@ class UserHelper extends Base
      */
     public function getFullname(array $user = array())
     {
-        return $this->user->getFullname(empty($user) ? $this->sessionStorage->user : $user);
-    }
-
-    /**
-     * Display avatar
-     *
-     * @access public
-     * @param  string   $user_id
-     * @param  string   $username
-     * @param  string   $name
-     * @param  string   $email
-     * @return string
-     */
-    public function avatar($user_id, $username, $name, $email)
-    {
-        if (empty($user_id) && empty($username)) {
-            $html = $this->avatarManager->renderDefault(48);
-        } else {
-            $html = $this->avatarManager->render($user_id, $username, $name, $email, 48);
-        }
-
-        return '<div class="avatar">'.$html.'</div>';
+        return $this->user->getFullname(empty($user) ? $this->userSession->getAll() : $user);
     }
 }