diff options
| author | ThibG <thib@sitedethib.com> | 2019-02-12 20:29:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-12 20:29:55 +0100 |
| commit | a3ba28eb17d75af37396359e8c37675e06605ccf (patch) | |
| tree | 20d81ffc7b01b132e1683685a0176ede6374c13c /app/views/accounts | |
| parent | b89e003c4d049d64d2d4015357b8b931370bc5f0 (diff) | |
| parent | b47a53f90299a1fb52423aacbc0c23427e2eb132 (diff) | |
Merge pull request #913 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/accounts')
| -rw-r--r-- | app/views/accounts/show.html.haml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml index 0ee9dd7de..0da69728f 100644 --- a/app/views/accounts/show.html.haml +++ b/app/views/accounts/show.html.haml @@ -63,4 +63,17 @@ - @endorsed_accounts.each do |account| = account_link_to account + - @account.featured_tags.order(statuses_count: :desc).each do |featured_tag| + .directory__tag{ class: params[:tag] == featured_tag.name ? 'active' : nil } + = link_to short_account_tag_path(@account, featured_tag.tag) do + %h4 + = fa_icon 'hashtag' + = featured_tag.name + %small + - if featured_tag.last_status_at.nil? + = t('accounts.nothing_here') + - else + %time{ datetime: featured_tag.last_status_at.iso8601, title: l(featured_tag.last_status_at) }= l featured_tag.last_status_at + .trends__item__current= number_to_human featured_tag.statuses_count, strip_insignificant_zeros: true + = render 'application/sidebar' |