diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-12-02 16:30:52 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-02 16:30:52 -0600 |
| commit | fe9340d95e9ae9a1870e9951e9b00ad5df4cc257 (patch) | |
| tree | b99e381549fb89b1161b756dc21f37d9465741ce | |
| parent | 80462e1b8d472a1b3dc02b2bb4024e8642a3e613 (diff) | |
| parent | 1a5de0478906ade1443bd362ba41d8d0d38f1336 (diff) | |
Merge pull request #838 from ThibG/glitch-soc/features/reply-all-streaming-entries
Display a double reply arrow on public pages for toots that are replies
| -rw-r--r-- | app/views/stream_entries/_detailed_status.html.haml | 5 | ||||
| -rw-r--r-- | app/views/stream_entries/_simple_status.html.haml | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml index 6e6d0eda8..447667c5a 100644 --- a/app/views/stream_entries/_detailed_status.html.haml +++ b/app/views/stream_entries/_detailed_status.html.haml @@ -44,7 +44,10 @@ = link_to status.application.name, status.application.website, class: 'detailed-status__application', target: '_blank', rel: 'noopener' · = link_to remote_interaction_path(status), class: 'modal-button detailed-status__link' do - = fa_icon('reply') + - if status.in_reply_to_id.nil? + = fa_icon('reply') + - else + = fa_icon('reply-all') %span.detailed-status__reblogs>= number_to_human status.replies_count, strip_insignificant_zeros: true = " " · diff --git a/app/views/stream_entries/_simple_status.html.haml b/app/views/stream_entries/_simple_status.html.haml index e996d5052..3a4dacc06 100644 --- a/app/views/stream_entries/_simple_status.html.haml +++ b/app/views/stream_entries/_simple_status.html.haml @@ -37,7 +37,10 @@ .status__action-bar .status__action-bar__counter = link_to remote_interaction_path(status), class: 'status__action-bar-button icon-button modal-button', style: 'font-size: 18px; width: 23.1429px; height: 23.1429px; line-height: 23.15px;' do - = fa_icon 'reply fw' + - if status.in_reply_to_id.nil? + = fa_icon 'reply fw' + - else + = fa_icon 'reply-all fw' .status__action-bar__counter__label= obscured_counter status.replies_count = link_to remote_interaction_path(status), class: 'status__action-bar-button icon-button modal-button', style: 'font-size: 18px; width: 23.1429px; height: 23.1429px; line-height: 23.15px;' do - if status.public_visibility? || status.unlisted_visibility? |