OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity

Fix h-card classes and remote follow button appearing when it shouldn't

pull/425/head
Eugen Rochko 2017-01-06 20:15:24 +01:00
parent 8b28b82141
commit 72c3a41bef
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/accounts/_header.html.haml
View File

@ -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) - if user_signed_in? && current_account.id != @account.id && !current_account.requested?(@account)
.controls .controls
- if current_account.following?(@account) - if current_account.following?(@account)
= link_to t('accounts.unfollow'), unfollow_account_path(@account), data: { method: :post }, class: 'button' = link_to t('accounts.unfollow'), unfollow_account_path(@account), data: { method: :post }, class: 'button'
- else - else
= link_to t('accounts.follow'), follow_account_path(@account), data: { method: :post }, class: 'button' = link_to t('accounts.follow'), follow_account_path(@account), data: { method: :post }, class: 'button'
- else - elsif !user_signed_in?
.controls .controls
.remote-follow .remote-follow
= link_to t('accounts.remote_follow'), account_remote_follow_path(@account), class: 'button' = link_to t('accounts.remote_follow'), account_remote_follow_path(@account), class: 'button'

5
app/views/accounts/show.html.haml
View File

@ -15,8 +15,9 @@
%meta{ property: 'twitter:card', content: 'summary' }/ %meta{ property: 'twitter:card', content: 'summary' }/
.h-feed .h-feed
%data.p-name{ value: "#{@account.username} on #{Rails.configuration.x.local_domain}" } %data.p-name{ value: "#{@account.username} on #{Rails.configuration.x.local_domain}" }/
= render partial: 'header', locals: {in_feed: true}
= render partial: 'header'
- if @statuses.empty? - if @statuses.empty?
.accounts-grid .accounts-grid

4
app/views/stream_entries/_status.html.haml
View File

@ -3,7 +3,7 @@
- is_successor ||= false - is_successor ||= false
- centered ||= include_threads && !is_predecessor && !is_successor - centered ||= include_threads && !is_predecessor && !is_successor
%div{ class: [is_predecessor && 'u-in-reply-to h-cite', is_successor && 'u-comment h-cite', !is_predecessor && !is_successor && 'h-entry'] } %div{ class: [is_predecessor ? 'u-in-reply-to h-cite' : nil, is_successor ? 'u-comment h-cite' : nil, !is_predecessor && !is_successor ? 'h-entry' : nil].compact }
- if status.reply? && include_threads - if status.reply? && include_threads
= render partial: 'status', collection: @ancestors, as: :status, locals: { is_predecessor: true } = render partial: 'status', collection: @ancestors, as: :status, locals: { is_predecessor: true }
@ -17,7 +17,7 @@
%strong= display_name(status.account) %strong= display_name(status.account)
= t('stream_entries.reblogged') = t('stream_entries.reblogged')
%div{ class: [status.reblog? && 'u-repost-of h-cite'] } %div{ class: status.reblog? ? 'u-repost-of h-cite' : nil }
= render partial: centered ? 'stream_entries/detailed_status' : 'stream_entries/simple_status', locals: { status: proper_status(status) } = render partial: centered ? 'stream_entries/detailed_status' : 'stream_entries/simple_status', locals: { status: proper_status(status) }
- if include_threads - if include_threads