Add explanation to featured hashtags page and profile (#11586)
This commit is contained in:
		| @@ -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,24 +56,33 @@ | |||||||
|  |  | ||||||
|     = 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 | ||||||
|       .directory__tag{ class: params[:tag] == featured_tag.name ? 'active' : nil } |       .placeholder-widget | ||||||
|         = link_to short_account_tag_path(@account, featured_tag.tag) do |         = t('accounts.featured_tags_hint') | ||||||
|           %h4 |         = link_to settings_featured_tags_path do | ||||||
|             = fa_icon 'hashtag' |           = t('featured_tags.add_new') | ||||||
|             = featured_tag.name |           = fa_icon 'chevron-right fw' | ||||||
|             %small |     - else | ||||||
|               - if featured_tag.last_status_at.nil? |       - @featured_hashtags.each do |featured_tag| | ||||||
|                 = t('accounts.nothing_here') |         .directory__tag{ class: params[:tag] == featured_tag.name ? 'active' : nil } | ||||||
|               - else |           = link_to short_account_tag_path(@account, featured_tag.tag) do | ||||||
|                 %time.formatted{ datetime: featured_tag.last_status_at.iso8601, title: l(featured_tag.last_status_at) }= l featured_tag.last_status_at |             %h4 | ||||||
|           .trends__item__current= number_to_human featured_tag.statuses_count, strip_insignificant_zeros: true |               = 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' |     = render 'application/sidebar' | ||||||
|   | |||||||
| @@ -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 | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user