-
Notifications
You must be signed in to change notification settings - Fork 11.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[FIX] Auto complete user suggestions (#18437)
Co-authored-by: Tasso Evangelista <tasso.evangelista@rocket.chat>
- Loading branch information
1 parent
5a8762a
commit fdda142
Showing
2 changed files
with
38 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,21 @@ | ||
<template name="messagePopupUser"> | ||
{{#unless system}} | ||
<div class="popup-user-status border-transparent-dark popup-user-status-{{status}}"></div> | ||
<div class="popup-user-avatar" style="background-image:url({{avatarUrlFromUsername username avatarETag}});"></div> | ||
{{/unless}} | ||
<strong>{{username}}</strong> {{name}}{{#if nickname}} ({{nickname}}){{/if}} | ||
{{#if outside}} | ||
<div class="popup-user-not_in_channel">{{_ "Not_in_channel"}}</div> | ||
{{/if}} | ||
{{#if suggestion}} | ||
<div class="popup-user-not_in_channel">{{_ "Suggestion_from_recent_messages"}}</div> | ||
{{/if}} | ||
<div class="popup-user" title="{{#if outside}}{{_ 'Not_in_channel'}}{{/if}} {{#if suggestion}}{{_ 'Suggestion_from_recent_messages'}}{{/if}}"> | ||
{{#unless system}} | ||
<div class="popup-user-avatar_wrap"> | ||
<div class="popup-user-status border-transparent-dark popup-user-status-{{status}}"></div> | ||
<div class="popup-user-avatar" style="background-image:url({{avatarUrlFromUsername username avatarETag}});"></div> | ||
</div> | ||
{{/unless}} | ||
<div class="popup-user-name"> | ||
<strong>{{username}}</strong> {{name}}{{#if nickname}} ({{nickname}}){{/if}} | ||
</div> | ||
<div class="popup-user-notice"> | ||
{{#if outside}} | ||
<div class="popup-user-not_in_channel">{{_ "Not_in_channel"}}</div> | ||
{{/if}} | ||
{{#if suggestion}} | ||
<div class="popup-user-not_in_channel">{{_ "Suggestion_from_recent_messages"}}</div> | ||
{{/if}} | ||
</div> | ||
</div> | ||
</template> |