summaryrefslogtreecommitdiffstats
path: root/client/components/activities
diff options
context:
space:
mode:
authorMaxime Quandalle <maxime@quandalle.com>2015-06-08 11:47:06 +0200
committerMaxime Quandalle <maxime@quandalle.com>2015-06-09 15:57:45 +0200
commit46cc69153482a6138e1057ece9cec836dd95451e (patch)
tree79a22f159d20dfca8af4b50877ed40a335233763 /client/components/activities
parent98d7278d08dabc9e1da5dcd9a9bb968ab369520e (diff)
downloadwekan-46cc69153482a6138e1057ece9cec836dd95451e.tar.gz
wekan-46cc69153482a6138e1057ece9cec836dd95451e.tar.bz2
wekan-46cc69153482a6138e1057ece9cec836dd95451e.zip
Re-factor the avatar system and support avatar uploads
The user is now able to upload an avatar, and pick one in a list. This functionality should eventually be abstracted in a community package but we still need to work on a great public API. We rely on collectionFS to manage uploaded avatars. We also removed bengott:avatar which was trying to solve the wrong problem (namely displaying the avatar, which is as simple as displaying an image), and not a avatar system as it should be. Gravatar support is coming (back) soon. We may also want to have a list of default fun avatars the user can choose instead of uploading its own one.
Diffstat (limited to 'client/components/activities')
-rw-r--r--client/components/activities/templates.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/client/components/activities/templates.html b/client/components/activities/templates.html
index 8d3ff763..5a595a36 100644
--- a/client/components/activities/templates.html
+++ b/client/components/activities/templates.html
@@ -1,7 +1,7 @@
<template name="boardActivities">
{{# each currentBoard.activities }}
<div class="phenom phenom-action clearfix phenom-other">
- {{> userAvatar user=user size="extra-small" class="creator js-show-mem-menu" }}
+ {{> userAvatar userId=user._id}}
<div class="phenom-desc">
{{ > memberName user=user }}
@@ -86,7 +86,7 @@
<template name="cardActivities">
{{# each currentCard.comments }}
<div class="phenom phenom-action clearfix phenom-comment">
- {{> userAvatar user=user size="small" class="creator js-show-mem-menu" }}
+ {{> userAvatar userId=user._id}}
<form>
<div class="phenom-desc">
{{ > memberName user=user }}
@@ -115,7 +115,7 @@
{{# each currentCard.activities }}
<div class="phenom phenom-action clearfix phenom-other">
- {{> userAvatar user=user size="extra-small" class="creator js-show-mem-menu" }}
+ {{> userAvatar userId=user._id size="extra-small" class="creator js-show-mem-menu" }}
{{ > memberName user=user }}
{{# if $eq activityType 'createCard' }}
{{_ 'activity-added' cardLabel list.title}}.