diff options
| author | Maxime Quandalle <maxime@quandalle.com> | 2015-06-12 13:59:39 +0200 |
|---|---|---|
| committer | Maxime Quandalle <maxime@quandalle.com> | 2015-06-12 17:48:15 +0200 |
| commit | c8945679872a0708eb67a477a99a65d508c84cb0 (patch) | |
| tree | 5cf9f2cc842f891451f7bc247b5f0833c1ab39e7 /client/components/users/userAvatar.jade | |
| parent | 216887490e3be0ba141484afc11d37475e91562d (diff) | |
| download | wekan-c8945679872a0708eb67a477a99a65d508c84cb0.tar.gz wekan-c8945679872a0708eb67a477a99a65d508c84cb0.tar.bz2 wekan-c8945679872a0708eb67a477a99a65d508c84cb0.zip | |
Work on the card activities and comments
This commit also introduces a new CSSEvents object that is used to
abstract vendor specifics events related to CSS transitions and
animations.
Fixes #183.
Fixes #179.
Diffstat (limited to 'client/components/users/userAvatar.jade')
| -rw-r--r-- | client/components/users/userAvatar.jade | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/client/components/users/userAvatar.jade b/client/components/users/userAvatar.jade index 4c0e5c63..2ea3aa20 100644 --- a/client/components/users/userAvatar.jade +++ b/client/components/users/userAvatar.jade @@ -19,14 +19,17 @@ template(name="userPopup") +userAvatar(userId=user._id) .info h3.bottom - a.js-profile(href="{{pathFor route='Profile' username=user.username}}")= user.profile.name + = user.profile.fullname p.quiet.bottom @{{ user.username }} template(name="memberName") - a.js-show-mem-menu(href="{{pathFor route='Profile' username=user.username}}") + if showBoth = user.profile.fullname - if username - | ({{ user.username }}) + | ({{ user.username }}) + else if user.profile.fullname + = user.profile.fullname + else + = user.username template(name="changeAvatarPopup") ul.pop-over-list @@ -54,3 +57,14 @@ template(name="changeAvatarPopup") button.full.js-upload-avatar i.fa.fa-upload | Upload an avatar + +template(name="cardMemberPopup") + .board-member-menu + .mini-profile-info + +userAvatar(userId=user._id) + .info + h3.bottom= user.profile.fullname + p.quiet.bottom @{{ user.username }} + if currentUser.isBoardMember + ul.pop-over-list + li: a.js-remove-member {{_ 'remove-member-from-card'}} |