diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-02-26 16:18:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-26 16:18:41 +0100 |
| commit | 18513a978aecd36bf61a5cd7dba08f9f20729de9 (patch) | |
| tree | 3b27029bf1fde622ab77607c2159428d9c2ceb13 /app/views/accounts/_grid_card.html.haml | |
| parent | c33931b613c7da4cc2c22ff8411c38556dc579cb (diff) | |
Improve public account cards (#6559)
- Add follow/unfollow/remote follow buttons - Format the bio properly - Always show username@domain, even for local accounts
Diffstat (limited to 'app/views/accounts/_grid_card.html.haml')
| -rw-r--r-- | app/views/accounts/_grid_card.html.haml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/views/accounts/_grid_card.html.haml b/app/views/accounts/_grid_card.html.haml index 305eb2c44..95acbd581 100644 --- a/app/views/accounts/_grid_card.html.haml +++ b/app/views/accounts/_grid_card.html.haml @@ -1,9 +1,12 @@ .account-grid-card .account-grid-card__header{ style: "background-image: url(#{account.header.url(:original)})" } + = render 'accounts/follow_button', account: account, relationships: @relationships .account-grid-card__avatar .avatar= image_tag account.avatar.url(:original) .name = link_to TagManager.instance.url_for(account) do %span.display_name.emojify= display_name(account) - %span.username @#{account.acct} - %p.note.emojify= truncate(strip_tags(account.note), length: 150) + %span.username + @#{account.local? ? account.local_username_and_domain : account.acct} + = fa_icon('lock') if account.locked? + .account__header__content.p-note.emojify= Formatter.instance.simplified_format(account) |