diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-07-01 04:12:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-01 04:12:34 +0200 |
| commit | 2092d5c0ad099e8f60eb001ee0cd647fc759aefc (patch) | |
| tree | f5e6dfdd44ebf18bd648fdfbe5bd9b446ee1d5b3 /app/views | |
| parent | 8fea9cc3112968d90ba4df02a90aa3a031a5f3a9 (diff) | |
Improve embeds (#7919)
* Make embeds cacheable by reverse proxy * Make follow button on embeds open remote follow modal Instead of web+mastodon://, also, turn the button blue, and add a sign up prompt to the remote follow modal
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/remote_follow/new.html.haml | 2 | ||||
| -rw-r--r-- | app/views/stream_entries/_detailed_status.html.haml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/views/remote_follow/new.html.haml b/app/views/remote_follow/new.html.haml index fc5c4da20..3273c318c 100644 --- a/app/views/remote_follow/new.html.haml +++ b/app/views/remote_follow/new.html.haml @@ -11,3 +11,5 @@ .actions = f.button :button, t('remote_follow.proceed'), type: :submit + + %p.hint.subtle-hint= t('remote_follow.no_account_html', sign_up_path: open_registrations? ? new_user_registration_path : 'https://joinmastodon.org') diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml index c0f1e4f0f..de844818f 100644 --- a/app/views/stream_entries/_detailed_status.html.haml +++ b/app/views/stream_entries/_detailed_status.html.haml @@ -8,7 +8,7 @@ %span= acct(status.account) - if embedded_view? - = link_to "web+mastodon://follow?uri=#{status.account.local_username_and_domain}", class: 'button button-secondary logo-button', target: '_new' do + = link_to account_remote_follow_path(status.account), class: 'button button-secondary logo-button', target: '_new' do = render file: Rails.root.join('app', 'javascript', 'images', 'logo.svg') = t('accounts.follow') |