diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-07-07 22:20:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-07 22:20:14 +0200 |
| commit | 30e1da7668c6c42aa5f15bdc9caab1929235f78f (patch) | |
| tree | 54d1cd443359a52338f4de37f4cdd04700c9a755 /app/views | |
| parent | 6b9e03e002ed349fd8b7e2879d599bb75a698eb2 (diff) | |
Add follow button to detailed status, add gradient to mask bio cut-off (#7979)
* Add follow button to detailed status, add gradient to mask bio cut-off * In landing strip, show sign up link even if closed (different href) Point to joinmastodon.org
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/remote_follow/new.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/_landing_strip.html.haml | 4 | ||||
| -rw-r--r-- | app/views/stream_entries/_detailed_status.html.haml | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/app/views/remote_follow/new.html.haml b/app/views/remote_follow/new.html.haml index 361bb53e4..9b22fda5f 100644 --- a/app/views/remote_follow/new.html.haml +++ b/app/views/remote_follow/new.html.haml @@ -16,4 +16,4 @@ .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') + %p.hint.subtle-hint= t('remote_follow.no_account_html', sign_up_path: open_registrations? ? new_user_registration_path : 'https://joinmastodon.org/#getting-started') diff --git a/app/views/shared/_landing_strip.html.haml b/app/views/shared/_landing_strip.html.haml index 78f5ed4bc..9a4144723 100644 --- a/app/views/shared/_landing_strip.html.haml +++ b/app/views/shared/_landing_strip.html.haml @@ -3,6 +3,4 @@ %div = t('landing_strip_html', name: content_tag(:span, display_name(account, custom_emojify: true), class: :emojify), link_to_root_path: link_to(content_tag(:strong, site_hostname), root_path)) - - - if open_registrations? - = t('landing_strip_signup_html', sign_up_path: new_user_registration_path) + = t('landing_strip_signup_html', sign_up_path: open_registrations? ? new_user_registration_path : 'https://joinmastodon.org/#getting-started') diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml index 3fc715c4e..85e90a237 100644 --- a/app/views/stream_entries/_detailed_status.html.haml +++ b/app/views/stream_entries/_detailed_status.html.haml @@ -7,7 +7,7 @@ %strong.p-name.emojify= display_name(status.account, custom_emojify: true) %span= acct(status.account) - - if embedded_view? + - if !user_signed_in? || embedded_view? = 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') |