diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-08-18 18:04:49 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-18 18:04:49 +0200 |
| commit | bfeac6747a58b660f0d1b3766c7cfb3ea2655fce (patch) | |
| tree | e9d1366c30b94df21ec767276fbde175428399fb /app/views/stream_entries/_detailed_status.html.haml | |
| parent | 7423c0c1308555db3072ae64141250fdd33ce235 (diff) | |
| parent | 298ee84488758fc08a0ae9233e04c9637aa2fe02 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: .circleci/config.yml app/controllers/authorize_follows_controller.rb app/javascript/packs/public.js Moved new stuff from packs/public.js to core/public.js. Added appropriate use_pack in new controllers.
Diffstat (limited to 'app/views/stream_entries/_detailed_status.html.haml')
| -rw-r--r-- | app/views/stream_entries/_detailed_status.html.haml | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml index aa160b979..a7c767816 100644 --- a/app/views/stream_entries/_detailed_status.html.haml +++ b/app/views/stream_entries/_detailed_status.html.haml @@ -39,6 +39,11 @@ - else = 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') + %span.detailed-status__reblogs>= number_to_human status.replies_count, strip_insignificant_zeros: true + = " " + · - if status.direct_visibility? %span.detailed-status__link< = fa_icon('envelope') @@ -46,13 +51,15 @@ %span.detailed-status__link< = fa_icon('lock') - else - %span.detailed-status__link< + = link_to remote_interaction_path(status), class: 'modal-button detailed-status__link' do = fa_icon('retweet') - %span.detailed-status__reblogs= number_to_human status.reblogs_count, strip_insignificant_zeros: true + %span.detailed-status__reblogs>= number_to_human status.reblogs_count, strip_insignificant_zeros: true + = " " · - %span.detailed-status__link< + = link_to remote_interaction_path(status), class: 'modal-button detailed-status__link' do = fa_icon('star') - %span.detailed-status__favorites= number_to_human status.favourites_count, strip_insignificant_zeros: true + %span.detailed-status__favorites>= number_to_human status.favourites_count, strip_insignificant_zeros: true + = " " - if user_signed_in? · |