diff options
| author | Sasha Sorokin <dafri.nochiterov8@gmail.com> | 2020-01-29 11:35:54 -0500 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2020-02-21 02:51:31 -0600 |
| commit | 6cfd4f4882d7198547005f561c8edff6f302bbb7 (patch) | |
| tree | 2522b96d5460d2a1d0b41e0dc325201afa276fb5 | |
| parent | b7532f167e075ed48eb2863939f074e4636dc29f (diff) | |
Add "Show thread" button to public profiles (#13000)
This adds "Show thread" button to the status view which is used in profiles. The logic to display the button is mimicking logic in web app available at app/javascript/mastodon/components/status.js#L439. * The little change in components CSS required to remove enforced underline for all links on public pages on our button.
| -rw-r--r-- | app/javascript/styles/mastodon/components.scss | 1 | ||||
| -rw-r--r-- | app/views/statuses/_simple_status.html.haml | 4 | ||||
| -rw-r--r-- | config/locales/en.yml | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index e868ff3bc..be8795534 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -803,6 +803,7 @@ background: transparent; padding: 0; padding-top: 8px; + text-decoration: none; &:hover, &:active { diff --git a/app/views/statuses/_simple_status.html.haml b/app/views/statuses/_simple_status.html.haml index 0affb1568..7df568873 100644 --- a/app/views/statuses/_simple_status.html.haml +++ b/app/views/statuses/_simple_status.html.haml @@ -41,6 +41,10 @@ - elsif status.preview_card = react_component :card, 'maxDescription': 160, card: ActiveModelSerializers::SerializableResource.new(status.preview_card, serializer: REST::PreviewCardSerializer).as_json + - if !status.in_reply_to_id.nil? && status.in_reply_to_account_id == status.account.id + = link_to ActivityPub::TagManager.instance.url_for(status), class: 'status__content__read-more-button', target: stream_link_target, rel: 'noopener noreferrer' do + = t 'statuses.show_thread' + .status__action-bar - if status.sharekey.present? && user_signed_in? && @account.id == status.account_id = link_to "#{TagManager.instance.url_for(status)}?key=#{status.sharekey}", class: 'status__action-bar-button icon-button', style: 'font-size: 18px; width: 23.1429px; height: 23.1429px; line-height: 23.15px', title: 'Right click or long-press to copy share link with key', target: stream_link_target, rel: 'noopener' do diff --git a/config/locales/en.yml b/config/locales/en.yml index 848f3395c..3278007ea 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1051,6 +1051,7 @@ en: replies_rejected: 'The author is not accepting replies to this roar.' kicked: "You do not have the author's permission to reply to this thread." show_more: Show more + show_thread: Show thread sign_in_to_participate: Sign in to participate in the conversation title: '%{name}: "%{quote}"' visibilities: |