From 457daf43534d668a466e87ba026ae69b35d29af0 Mon Sep 17 00:00:00 2001 From: "zyn on thu.closed.social" Date: Sun, 20 Oct 2019 09:06:20 +0000 Subject: [PATCH] better hide to unsigned user warning: only hide for web, api may also need to change --- app/views/accounts/_header.html.haml | 21 +++++++++++---------- app/views/accounts/show.html.haml | 2 +- app/views/tags/show.html.haml | 5 +++-- config/locales/zh-CN.yml | 1 + 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml index 24c3932bf..bc2e0ffba 100644 --- a/app/views/accounts/_header.html.haml +++ b/app/views/accounts/_header.html.haml @@ -13,7 +13,7 @@ .public-account-header__tabs .public-account-header__tabs__name %h1 - = user_signed_in? ? display_name(account, custom_emojify: true) : t('accounts.unavailable') + = user_signed_in? ? display_name(account, custom_emojify: true) : t('accounts.unsigned') %small = acct(account) = fa_icon('lock') if account.locked? @@ -37,13 +37,14 @@ .public-account-header__tabs__tabs__buttons = account_action_button(account) - .public-account-header__extra - = render 'accounts/bio', account: account + -if user_signed_in? + .public-account-header__extra + = render 'accounts/bio', account: account - .public-account-header__extra__links - = link_to account_following_index_url(account) do - %strong= number_to_human account.following_count, strip_insignificant_zeros: true - = t('accounts.following', count: account.following_count) - = link_to account_followers_url(account) do - %strong= number_to_human account.followers_count, strip_insignificant_zeros: true - = t('accounts.followers', count: account.followers_count) + .public-account-header__extra__links + = link_to account_following_index_url(account) do + %strong= number_to_human account.following_count, strip_insignificant_zeros: true + = t('accounts.following', count: account.following_count) + = link_to account_followers_url(account) do + %strong= number_to_human account.followers_count, strip_insignificant_zeros: true + = t('accounts.followers', count: account.followers_count) diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml index 041afbf7d..8cac67de5 100644 --- a/app/views/accounts/show.html.haml +++ b/app/views/accounts/show.html.haml @@ -1,5 +1,5 @@ - content_for :page_title do - = user_signed_in? ? "#{display_name(@account)} (@#{@account.local_username_and_domain})" : t('accounts.unavailable') + = user_signed_in? ? "#{display_name(@account)} (@#{@account.local_username_and_domain})" : t('accounts.unsigned') - content_for :header_tags do %meta{ name: 'description', content: account_description(@account) }/ diff --git a/app/views/tags/show.html.haml b/app/views/tags/show.html.haml index 630702277..731cccf91 100644 --- a/app/views/tags/show.html.haml +++ b/app/views/tags/show.html.haml @@ -12,5 +12,6 @@ %h1= "##{@tag.name}" %p= t('about.about_hashtag_html', hashtag: @tag.name) -#mastodon-timeline{ data: { props: Oj.dump(default_props.merge(hashtag: @tag.name)) }} -#modal-container +- if user_signed_in? + #mastodon-timeline{ data: { props: Oj.dump(default_props.merge(hashtag: @tag.name)) }} + #modal-container diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index f0526e0af..bf53cf3d9 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -62,6 +62,7 @@ zh-CN: moderator: 监察员 unavailable: 个人资料不可用 unfollow: 取消关注 + unsigned: 【登陆后可见】 admin: account_actions: action: 执行操作