diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-06 20:15:24 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-06 20:15:24 +0100 |
| commit | 72c3a41befb6407f21068ef4cb9e34187e3515f0 (patch) | |
| tree | d3e8e12652eccef1d080cad7759f818cdc61e39c /app/views/accounts | |
| parent | 8b28b82141996a2310c43834897f9c21e3ab7bc9 (diff) | |
Fix h-card classes and remote follow button appearing when it shouldn't
Diffstat (limited to 'app/views/accounts')
| -rw-r--r-- | app/views/accounts/_header.html.haml | 4 | ||||
| -rw-r--r-- | app/views/accounts/show.html.haml | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml index e410ff72c..7a5cea7ab 100644 --- a/app/views/accounts/_header.html.haml +++ b/app/views/accounts/_header.html.haml @@ -1,11 +1,11 @@ -.card.h-card{ class: [local_assigns[:in_feed] && 'p-author'], style: "background-image: url(#{@account.header.url( :original)})" } +.card.h-card.p-author{ style: "background-image: url(#{@account.header.url( :original)})" } - if user_signed_in? && current_account.id != @account.id && !current_account.requested?(@account) .controls - if current_account.following?(@account) = link_to t('accounts.unfollow'), unfollow_account_path(@account), data: { method: :post }, class: 'button' - else = link_to t('accounts.follow'), follow_account_path(@account), data: { method: :post }, class: 'button' - - else + - elsif !user_signed_in? .controls .remote-follow = link_to t('accounts.remote_follow'), account_remote_follow_path(@account), class: 'button' diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml index 8840b5503..c194ce33d 100644 --- a/app/views/accounts/show.html.haml +++ b/app/views/accounts/show.html.haml @@ -15,8 +15,9 @@ %meta{ property: 'twitter:card', content: 'summary' }/ .h-feed - %data.p-name{ value: "#{@account.username} on #{Rails.configuration.x.local_domain}" } - = render partial: 'header', locals: {in_feed: true} + %data.p-name{ value: "#{@account.username} on #{Rails.configuration.x.local_domain}" }/ + + = render partial: 'header' - if @statuses.empty? .accounts-grid |