diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-08-18 12:48:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-18 12:48:27 +0200 |
| commit | 85bb32c410a975bf6154a78a82797f82713e2428 (patch) | |
| tree | e94071f4cee5bc324ffc1977f02b72b9c0c47d36 | |
| parent | 5059989cc743e18f05e3f5f95ad557d7f7f34afd (diff) | |
Add "sign in to participate" message to public toot page (#8200)
| -rw-r--r-- | app/javascript/styles/mastodon/stream_entries.scss | 12 | ||||
| -rw-r--r-- | app/views/stream_entries/_status.html.haml | 6 | ||||
| -rw-r--r-- | config/locales/en.yml | 1 |
3 files changed, 15 insertions, 4 deletions
diff --git a/app/javascript/styles/mastodon/stream_entries.scss b/app/javascript/styles/mastodon/stream_entries.scss index 03bbd84db..5aa809f76 100644 --- a/app/javascript/styles/mastodon/stream_entries.scss +++ b/app/javascript/styles/mastodon/stream_entries.scss @@ -37,7 +37,8 @@ &:last-child { .detailed-status, - .status { + .status, + .load-more { border-bottom: 0; border-radius: 0 0 4px 4px; } @@ -45,13 +46,15 @@ &:first-child { .detailed-status, - .status { + .status, + .load-more { border-radius: 4px 4px 0 0; } &:last-child { .detailed-status, - .status { + .status, + .load-more { border-radius: 4px; } } @@ -59,7 +62,8 @@ @media screen and (max-width: 740px) { .detailed-status, - .status { + .status, + .load-more { border-radius: 0 !important; } } diff --git a/app/views/stream_entries/_status.html.haml b/app/views/stream_entries/_status.html.haml index 320c9bc4f..92003a48f 100644 --- a/app/views/stream_entries/_status.html.haml +++ b/app/views/stream_entries/_status.html.haml @@ -53,3 +53,9 @@ - if @next_descendant_thread .entry{ class: entry_classes } = link_to_more short_account_status_url(status.account.username, status, since_descendant_thread_id: @max_descendant_thread_id - 1) + +- if include_threads && !embedded_view? && !user_signed_in? + .entry{ class: entry_classes } + = link_to new_user_session_path, class: 'load-more load-gap' do + = fa_icon 'comments' + = t('statuses.sign_in_to_participate') diff --git a/config/locales/en.yml b/config/locales/en.yml index 90086103c..66ab8f10a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -746,6 +746,7 @@ en: private: Non-public toot cannot be pinned reblog: A boost cannot be pinned show_more: Show more + sign_in_to_participate: Sign in to participate in the conversation title: '%{name}: "%{quote}"' visibilities: private: Followers-only |