queer-af/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix microformats on statuses according to updated spec (#8958)

Browse source
This commit is contained in:
Eugen Rochko 2018-10-12 02:04:07 +02:00 committed by GitHub
parent edc7f895be
commit 5cbbd2c3b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/views/stream_entries/_detailed_status.html.haml
View file

@ -1,16 +1,17 @@
.detailed-status.detailed-status--flex .detailed-status.detailed-status--flex
= link_to TagManager.instance.url_for(status.account), class: 'detailed-status__display-name p-author h-card', target: stream_link_target, rel: 'noopener' do .p-author.h-card
.detailed-status__display-avatar = link_to TagManager.instance.url_for(status.account), class: 'detailed-status__display-name u-url', target: stream_link_target, rel: 'noopener' do
- if current_account&.user&.setting_auto_play_gif || autoplay .detailed-status__display-avatar
= image_tag status.account.avatar_original_url, width: 48, height: 48, alt: '', class: 'account__avatar u-photo' - if current_account&.user&.setting_auto_play_gif || autoplay
- else = image_tag status.account.avatar_original_url, width: 48, height: 48, alt: '', class: 'account__avatar u-photo'
= image_tag status.account.avatar_static_url, width: 48, height: 48, alt: '', class: 'account__avatar u-photo' - else
%span.display-name = image_tag status.account.avatar_static_url, width: 48, height: 48, alt: '', class: 'account__avatar u-photo'
%bdi %span.display-name
%strong.display-name__html.p-name.emojify= display_name(status.account, custom_emojify: true, autoplay: autoplay) %bdi
%span.display-name__account %strong.display-name__html.p-name.emojify= display_name(status.account, custom_emojify: true, autoplay: autoplay)
= acct(status.account) %span.display-name__account
= fa_icon('lock') if status.account.locked? = acct(status.account)
= fa_icon('lock') if status.account.locked?
= account_action_button(status.account) = account_action_button(status.account)

27
app/views/stream_entries/_simple_status.html.haml
View file

@ -4,19 +4,20 @@
%time.time-ago{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at) %time.time-ago{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
%data.dt-published{ value: status.created_at.to_time.iso8601 } %data.dt-published{ value: status.created_at.to_time.iso8601 }
= link_to TagManager.instance.url_for(status.account), class: 'status__display-name p-author h-card', target: stream_link_target, rel: 'noopener' do .p-author.h-card
.status__avatar = link_to TagManager.instance.url_for(status.account), class: 'status__display-name u-url', target: stream_link_target, rel: 'noopener' do
%div .status__avatar
- if current_account&.user&.setting_auto_play_gif || autoplay %div
= image_tag status.account.avatar_original_url, width: 48, height: 48, alt: '', class: 'u-photo account__avatar' - if current_account&.user&.setting_auto_play_gif || autoplay
- else = image_tag status.account.avatar_original_url, width: 48, height: 48, alt: '', class: 'u-photo account__avatar'
= image_tag status.account.avatar_static_url, width: 48, height: 48, alt: '', class: 'u-photo account__avatar' - else
%span.display-name = image_tag status.account.avatar_static_url, width: 48, height: 48, alt: '', class: 'u-photo account__avatar'
%bdi %span.display-name
%strong.display-name__html.p-name.emojify= display_name(status.account, custom_emojify: true, autoplay: autoplay) %bdi
%span.display-name__account %strong.display-name__html.p-name.emojify= display_name(status.account, custom_emojify: true, autoplay: autoplay)
= acct(status.account) %span.display-name__account
= fa_icon('lock') if status.account.locked? = acct(status.account)
= fa_icon('lock') if status.account.locked?
.status__content.emojify< .status__content.emojify<
- if status.spoiler_text? - if status.spoiler_text?
%p{ :style => ('margin-bottom: 0' unless current_account&.user&.setting_expand_spoilers) }< %p{ :style => ('margin-bottom: 0' unless current_account&.user&.setting_expand_spoilers) }<