diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml
index 4ef9f9478..24c3932bf 100644
--- a/app/views/accounts/_header.html.haml
+++ b/app/views/accounts/_header.html.haml
@@ -1,13 +1,19 @@
.public-account-header{:class => ("inactive" if account.moved?)}
.public-account-header__image
- = image_tag (current_account&.user&.setting_auto_play_gif ? account.header_original_url : account.header_static_url), class: 'parallax'
+ - if user_signed_in?
+ = image_tag (current_account&.user&.setting_auto_play_gif ? account.header_original_url : account.header_static_url), class: 'parallax'
+ - else
+ = image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url || asset_pack_path('media/images/preview.jpg'), alt: @instance_presenter.site_title
.public-account-header__bar
= link_to short_account_url(account), class: 'avatar' do
- = image_tag (current_account&.user&.setting_auto_play_gif ? account.avatar_original_url : account.avatar_static_url), id: 'profile_page_avatar', data: {original: full_asset_url(account.avatar_original_url), static: full_asset_url(account.avatar_static_url), autoplay: current_account&.user&.setting_auto_play_gif}
+ - if user_signed_in?
+ = image_tag (current_account&.user&.setting_auto_play_gif ? account.avatar_original_url : account.avatar_static_url), id: 'profile_page_avatar', data: {original: full_asset_url(account.avatar_original_url), static: full_asset_url(account.avatar_static_url), autoplay: current_account&.user&.setting_auto_play_gif}
+ - else
+ = image_tag @instance_presenter.mascot&.file&.url || asset_pack_path('media/images/elephant_ui_plane.svg'), alt: ''
.public-account-header__tabs
.public-account-header__tabs__name
%h1
- = display_name(account, custom_emojify: true)
+ = user_signed_in? ? display_name(account, custom_emojify: true) : t('accounts.unavailable')
%small
= acct(account)
= fa_icon('lock') if account.locked?
diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml
index 9c26dbabc..041afbf7d 100644
--- a/app/views/accounts/show.html.haml
+++ b/app/views/accounts/show.html.haml
@@ -1,5 +1,5 @@
- content_for :page_title do
- = "#{display_name(@account)} (@#{@account.local_username_and_domain})"
+ = user_signed_in? ? "#{display_name(@account)} (@#{@account.local_username_and_domain})" : t('accounts.unavailable')
- content_for :header_tags do
%meta{ name: 'description', content: account_description(@account) }/
@@ -31,7 +31,7 @@
= active_link_to t('accounts.posts_with_replies'), short_account_with_replies_url(@account)
= active_link_to t('accounts.media'), short_account_media_url(@account)
- - if user_signed_in? && @account.blocking?(current_account)
+ - if not user_signed_in? || @account.blocking?(current_account)
.nothing-here.nothing-here--under-tabs= t('accounts.unavailable')
- elsif @statuses.empty?
= nothing_here 'nothing-here--under-tabs'
@@ -48,41 +48,42 @@
- if @older_url
.entry= link_to_more @older_url
- .column-1
- - if @account.memorial?
- .memoriam-widget= t('in_memoriam_html')
- - elsif @account.moved?
- = render 'moved', account: @account
-
- = render 'bio', account: @account
-
- - if @endorsed_accounts.empty? && @account.id == current_account&.id
- .placeholder-widget= t('accounts.endorsements_hint')
- - elsif !@endorsed_accounts.empty?
- .endorsements-widget
- %h4= t 'accounts.choices_html', name: content_tag(:bdi, display_name(@account, custom_emojify: true))
-
- - @endorsed_accounts.each do |account|
- = account_link_to account
-
- - if @featured_hashtags.empty? && @account.id == current_account&.id
- .placeholder-widget
- = t('accounts.featured_tags_hint')
- = link_to settings_featured_tags_path do
- = t('featured_tags.add_new')
- = fa_icon 'chevron-right fw'
- - else
- - @featured_hashtags.each do |featured_tag|
- .directory__tag{ class: params[:tag] == featured_tag.name ? 'active' : nil }
- = link_to short_account_tag_path(@account, featured_tag.tag) do
- %h4
- = fa_icon 'hashtag'
- = featured_tag.name
- %small
- - if featured_tag.last_status_at.nil?
- = t('accounts.nothing_here')
- - else
- %time.formatted{ datetime: featured_tag.last_status_at.iso8601, title: l(featured_tag.last_status_at) }= l featured_tag.last_status_at
- .trends__item__current= number_to_human featured_tag.statuses_count, strip_insignificant_zeros: true
-
- = render 'application/sidebar'
+ - if user_signed_in?
+ .column-1
+ - if @account.memorial?
+ .memoriam-widget= t('in_memoriam_html')
+ - elsif @account.moved?
+ = render 'moved', account: @account
+
+ = render 'bio', account: @account
+
+ - if @endorsed_accounts.empty? && @account.id == current_account&.id
+ .placeholder-widget= t('accounts.endorsements_hint')
+ - elsif !@endorsed_accounts.empty?
+ .endorsements-widget
+ %h4= t 'accounts.choices_html', name: content_tag(:bdi, display_name(@account, custom_emojify: true))
+
+ - @endorsed_accounts.each do |account|
+ = account_link_to account
+
+ - if @featured_hashtags.empty? && @account.id == current_account&.id
+ .placeholder-widget
+ = t('accounts.featured_tags_hint')
+ = link_to settings_featured_tags_path do
+ = t('featured_tags.add_new')
+ = fa_icon 'chevron-right fw'
+ - else
+ - @featured_hashtags.each do |featured_tag|
+ .directory__tag{ class: params[:tag] == featured_tag.name ? 'active' : nil }
+ = link_to short_account_tag_path(@account, featured_tag.tag) do
+ %h4
+ = fa_icon 'hashtag'
+ = featured_tag.name
+ %small
+ - if featured_tag.last_status_at.nil?
+ = t('accounts.nothing_here')
+ - else
+ %time.formatted{ datetime: featured_tag.last_status_at.iso8601, title: l(featured_tag.last_status_at) }= l featured_tag.last_status_at
+ .trends__item__current= number_to_human featured_tag.statuses_count, strip_insignificant_zeros: true
+
+ = render 'application/sidebar'
diff --git a/app/views/follower_accounts/index.html.haml b/app/views/follower_accounts/index.html.haml
index 645dd2de1..a6de0291f 100644
--- a/app/views/follower_accounts/index.html.haml
+++ b/app/views/follower_accounts/index.html.haml
@@ -1,5 +1,5 @@
- content_for :page_title do
- = t('accounts.people_who_follow', name: display_name(@account))
+ = user_signed_in? ? t('accounts.people_who_follow', name: display_name(@account)) : t('accounts.unavailable')
- content_for :header_tags do
%meta{ name: 'robots', content: 'noindex' }/
@@ -7,10 +7,10 @@
= render 'accounts/header', account: @account
-- if @account.user_hides_network?
- .nothing-here= t('accounts.network_hidden')
-- elsif user_signed_in? && @account.blocking?(current_account)
+- if not user_signed_in? || @account.blocking?(current_account)
.nothing-here= t('accounts.unavailable')
+- elsif @account.user_hides_network?
+ .nothing-here= t('accounts.network_hidden')
- elsif @follows.empty?
= nothing_here
- else
diff --git a/app/views/following_accounts/index.html.haml b/app/views/following_accounts/index.html.haml
index 17fe79018..6ea0600d1 100644
--- a/app/views/following_accounts/index.html.haml
+++ b/app/views/following_accounts/index.html.haml
@@ -1,5 +1,5 @@
- content_for :page_title do
- = t('accounts.people_followed_by', name: display_name(@account))
+ = user_signed_in? ? t('accounts.people_followed_by', name: display_name(@account)) : t('accounts.unavailable')
- content_for :header_tags do
%meta{ name: 'robots', content: 'noindex' }/
@@ -7,10 +7,10 @@
= render 'accounts/header', account: @account
-- if @account.user_hides_network?
- .nothing-here= t('accounts.network_hidden')
-- elsif user_signed_in? && @account.blocking?(current_account)
+- if not user_signed_in? || @account.blocking?(current_account)
.nothing-here= t('accounts.unavailable')
+- elsif @account.user_hides_network?
+ .nothing-here= t('accounts.network_hidden')
- elsif @follows.empty?
= nothing_here
- else