nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up h-card mess of divs

This commit is contained in:
Eugen Rochko 2017-01-06 20:24:51 +01:00
parent 72c3a41bef
commit 1bfbce7b45
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/helpers/stream_entries_helper.rb
View File

@ -15,10 +15,10 @@ module StreamEntriesHelper
def entry_classes(status, is_predecessor, is_successor, include_threads) def entry_classes(status, is_predecessor, is_successor, include_threads)
classes = ['entry'] classes = ['entry']
classes << 'entry-reblog' if status.reblog? classes << 'entry-reblog u-repost-of h-cite' if status.reblog?
classes << 'entry-predecessor' if is_predecessor classes << 'entry-predecessor u-in-reply-to h-cite' if is_predecessor
classes << 'entry-successor' if is_successor classes << 'entry-successor u-comment h-cite' if is_successor
classes << 'entry-center' if include_threads classes << 'entry-center h-entry' if include_threads
classes.join(' ') classes.join(' ')
end end

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

@ -3,22 +3,20 @@
- 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' : 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 }
.entry{ class: entry_classes(status, is_predecessor, is_successor, include_threads) } .entry{ class: entry_classes(status, is_predecessor, is_successor, include_threads) }
- if status.reblog? - if status.reblog?
.pre-header .pre-header
%div.pre-header__icon %div.pre-header__icon
= fa_icon('retweet fw') = fa_icon('retweet fw')
%span %span
= link_to TagManager.instance.url_for(status.account), class: 'status__display-name muted' do = link_to TagManager.instance.url_for(status.account), class: 'status__display-name muted' do
%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' : 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
= render partial: 'status', collection: @descendants, as: :status, locals: { is_successor: true } = render partial: 'status', collection: @descendants, as: :status, locals: { is_successor: true }