treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Do not show timeline preview or directory widgets if they are disabled (#10284)

remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
ThibG 2019-03-19 05:48:17 +01:00 committed by Eugen Rochko
parent 9d9b6e3543
commit d041b7a1e7
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/views/about/show.html.haml
View File

@ -17,23 +17,25 @@
= render 'registration' = render 'registration'
.directory .directory
.directory__tag{ class: Setting.profile_directory ? nil : 'disabled' } - if Setting.profile_directory
= optional_link_to Setting.profile_directory, explore_path do .directory__tag
%h4 = optional_link_to Setting.profile_directory, explore_path do
= fa_icon 'address-book fw' %h4
= t('about.discover_users') = fa_icon 'address-book fw'
%small= t('about.browse_directory') = t('about.discover_users')
%small= t('about.browse_directory')
.avatar-stack .avatar-stack
- @instance_presenter.sample_accounts.each do |account| - @instance_presenter.sample_accounts.each do |account|
= image_tag current_account&.user&.setting_auto_play_gif ? account.avatar_original_url : account.avatar_static_url, width: 48, height: 48, alt: '', class: 'account__avatar' = image_tag current_account&.user&.setting_auto_play_gif ? account.avatar_original_url : account.avatar_static_url, width: 48, height: 48, alt: '', class: 'account__avatar'
.directory__tag{ class: Setting.timeline_preview ? nil : 'disabled' } - if Setting.timeline_preview
= optional_link_to Setting.timeline_preview, public_timeline_path do .directory__tag
%h4 = optional_link_to Setting.timeline_preview, public_timeline_path do
= fa_icon 'globe fw' %h4
= t('about.see_whats_happening') = fa_icon 'globe fw'
%small= t('about.browse_public_posts') = t('about.see_whats_happening')
%small= t('about.browse_public_posts')
.directory__tag .directory__tag
= link_to 'https://joinmastodon.org/apps', target: '_blank', rel: 'noopener' do = link_to 'https://joinmastodon.org/apps', target: '_blank', rel: 'noopener' do