mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-18 20:39:32 +00:00
Add explanation to featured hashtags page and profile (#11586)
This commit is contained in:
parent
53071389ee
commit
b348c9b0db
|
@ -18,6 +18,7 @@ class AccountsController < ApplicationController
|
||||||
|
|
||||||
@pinned_statuses = []
|
@pinned_statuses = []
|
||||||
@endorsed_accounts = @account.endorsed_accounts.to_a.sample(4)
|
@endorsed_accounts = @account.endorsed_accounts.to_a.sample(4)
|
||||||
|
@featured_hashtags = @account.featured_tags.order(statuses_count: :desc)
|
||||||
|
|
||||||
if current_account && @account.blocking?(current_account)
|
if current_account && @account.blocking?(current_account)
|
||||||
@statuses = []
|
@statuses = []
|
||||||
|
|
|
@ -109,6 +109,15 @@
|
||||||
box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
|
box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.placeholder-widget {
|
||||||
|
padding: 16px;
|
||||||
|
border-radius: 4px;
|
||||||
|
border: 2px dashed $dark-text-color;
|
||||||
|
text-align: center;
|
||||||
|
color: $darker-text-color;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
.contact-widget,
|
.contact-widget,
|
||||||
.landing-page__information.contact-widget {
|
.landing-page__information.contact-widget {
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
|
@ -526,6 +535,12 @@ $fluid-breakpoint: $maximum-width + 20px;
|
||||||
a {
|
a {
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
line-height: 20px;
|
line-height: 20px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.notice-widget,
|
||||||
|
.placeholder-widget {
|
||||||
|
a {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
color: $ui-highlight-color;
|
color: $ui-highlight-color;
|
||||||
|
|
|
@ -56,14 +56,23 @@
|
||||||
|
|
||||||
= render 'bio', account: @account
|
= render 'bio', account: @account
|
||||||
|
|
||||||
- unless @endorsed_accounts.empty?
|
- if @endorsed_accounts.empty? && @account.id == current_account&.id
|
||||||
|
.placeholder-widget= t('accounts.endorsements_hint')
|
||||||
|
- elsif !@endorsed_accounts.empty?
|
||||||
.endorsements-widget
|
.endorsements-widget
|
||||||
%h4= t 'accounts.choices_html', name: content_tag(:bdi, display_name(@account, custom_emojify: true))
|
%h4= t 'accounts.choices_html', name: content_tag(:bdi, display_name(@account, custom_emojify: true))
|
||||||
|
|
||||||
- @endorsed_accounts.each do |account|
|
- @endorsed_accounts.each do |account|
|
||||||
= account_link_to account
|
= account_link_to account
|
||||||
|
|
||||||
- @account.featured_tags.order(statuses_count: :desc).each do |featured_tag|
|
- 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 }
|
.directory__tag{ class: params[:tag] == featured_tag.name ? 'active' : nil }
|
||||||
= link_to short_account_tag_path(@account, featured_tag.tag) do
|
= link_to short_account_tag_path(@account, featured_tag.tag) do
|
||||||
%h4
|
%h4
|
||||||
|
|
|
@ -1,6 +1,10 @@
|
||||||
- content_for :page_title do
|
- content_for :page_title do
|
||||||
= t('settings.featured_tags')
|
= t('settings.featured_tags')
|
||||||
|
|
||||||
|
%p= t('featured_tags.hint_html')
|
||||||
|
|
||||||
|
%hr.spacer/
|
||||||
|
|
||||||
= simple_form_for @featured_tag, url: settings_featured_tags_path do |f|
|
= simple_form_for @featured_tag, url: settings_featured_tags_path do |f|
|
||||||
= render 'shared/error_messages', object: @featured_tag
|
= render 'shared/error_messages', object: @featured_tag
|
||||||
|
|
||||||
|
|
|
@ -45,6 +45,8 @@ en:
|
||||||
what_is_mastodon: What is Mastodon?
|
what_is_mastodon: What is Mastodon?
|
||||||
accounts:
|
accounts:
|
||||||
choices_html: "%{name}'s choices:"
|
choices_html: "%{name}'s choices:"
|
||||||
|
endorsements_hint: You can endorse people you follow from the web interface, and they will show up here.
|
||||||
|
featured_tags_hint: You can feature specific hashtags that will be displayed here.
|
||||||
follow: Follow
|
follow: Follow
|
||||||
followers:
|
followers:
|
||||||
one: Follower
|
one: Follower
|
||||||
|
@ -664,6 +666,7 @@ en:
|
||||||
add_new: Add new
|
add_new: Add new
|
||||||
errors:
|
errors:
|
||||||
limit: You have already featured the maximum amount of hashtags
|
limit: You have already featured the maximum amount of hashtags
|
||||||
|
hint_html: "<strong>What are featured hashtags?</strong> They are displayed prominently on your public profile and allow people to browse your public posts specifically under those hashtags. They are a great tool for keeping track of creative works or long-term projects."
|
||||||
filters:
|
filters:
|
||||||
contexts:
|
contexts:
|
||||||
home: Home timeline
|
home: Home timeline
|
||||||
|
|
Loading…
Reference in a new issue