Add explanation to featured hashtags page and profile (#11586)
This commit is contained in:
		
							parent
							
								
									53071389ee
								
							
						
					
					
						commit
						b348c9b0db
					
				
					 5 changed files with 45 additions and 13 deletions
				
			
		| 
						 | 
				
			
			@ -18,6 +18,7 @@ class AccountsController < ApplicationController
 | 
			
		|||
 | 
			
		||||
        @pinned_statuses   = []
 | 
			
		||||
        @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)
 | 
			
		||||
          @statuses = []
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -109,6 +109,15 @@
 | 
			
		|||
  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,
 | 
			
		||||
.landing-page__information.contact-widget {
 | 
			
		||||
  box-sizing: border-box;
 | 
			
		||||
| 
						 | 
				
			
			@ -526,6 +535,12 @@ $fluid-breakpoint: $maximum-width + 20px;
 | 
			
		|||
  a {
 | 
			
		||||
    font-size: 14px;
 | 
			
		||||
    line-height: 20px;
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.notice-widget,
 | 
			
		||||
.placeholder-widget {
 | 
			
		||||
  a {
 | 
			
		||||
    text-decoration: none;
 | 
			
		||||
    font-weight: 500;
 | 
			
		||||
    color: $ui-highlight-color;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -56,24 +56,33 @@
 | 
			
		|||
 | 
			
		||||
    = 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
 | 
			
		||||
        %h4= t 'accounts.choices_html', name: content_tag(:bdi, display_name(@account, custom_emojify: true))
 | 
			
		||||
 | 
			
		||||
        - @endorsed_accounts.each do |account|
 | 
			
		||||
          = account_link_to account
 | 
			
		||||
 | 
			
		||||
    - @account.featured_tags.order(statuses_count: :desc).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
 | 
			
		||||
    - 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'
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,6 +1,10 @@
 | 
			
		|||
- content_for :page_title do
 | 
			
		||||
  = t('settings.featured_tags')
 | 
			
		||||
 | 
			
		||||
%p= t('featured_tags.hint_html')
 | 
			
		||||
 | 
			
		||||
%hr.spacer/
 | 
			
		||||
 | 
			
		||||
= simple_form_for @featured_tag, url: settings_featured_tags_path do |f|
 | 
			
		||||
  = render 'shared/error_messages', object: @featured_tag
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -45,6 +45,8 @@ en:
 | 
			
		|||
    what_is_mastodon: What is Mastodon?
 | 
			
		||||
  accounts:
 | 
			
		||||
    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
 | 
			
		||||
    followers:
 | 
			
		||||
      one: Follower
 | 
			
		||||
| 
						 | 
				
			
			@ -664,6 +666,7 @@ en:
 | 
			
		|||
    add_new: Add new
 | 
			
		||||
    errors:
 | 
			
		||||
      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:
 | 
			
		||||
    contexts:
 | 
			
		||||
      home: Home timeline
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Reference in a new issue