forked from mastodon/mastodon
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improving status display design, including replies and threads
- Loading branch information
Showing
9 changed files
with
58 additions
and
37 deletions.
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,23 @@ | ||
%div.entry{ class: status.reblog? ? 'entry-reblog' : 'entry-status' } | ||
- if status.reply? && include_threads | ||
= render partial: 'status', locals: { status: status.thread, include_threads: false, is_predecessor: true, is_successor: false } | ||
|
||
.entry{ class: entry_classes(status, is_predecessor, is_successor, include_threads) } | ||
- if status.reblog? | ||
.pre-header | ||
%i.fa.fa-retweet | ||
Shared by | ||
= link_to display_name(status.account), profile_url(status.account), class: 'name' | ||
.entry-container | ||
.entry__container | ||
.avatar | ||
= image_tag status.reblog? ? status.reblog.account.avatar.url(:small) : status.account.avatar.url(:small) | ||
.container | ||
= image_tag avatar_for_status_url(status) | ||
.entry__container__container | ||
.header | ||
= render partial: 'status_header', locals: { status: status.reblog? ? status.reblog : status } | ||
.content | ||
= status.content | ||
.counters | ||
= render partial: 'status_footer', locals: { status: status.reblog? ? status.reblog : status } | ||
|
||
- if include_threads | ||
- status.replies.each do |status| | ||
= render partial: 'status', locals: { status: status, include_threads: false, is_successor: true, is_predecessor: false } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
%div.activity-stream | ||
= render partial: @type, locals: { @type.to_sym => @entry.activity } | ||
= render partial: @type, locals: { @type.to_sym => @entry.activity, include_threads: true, is_predecessor: false, is_successor: false } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters