gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Change "Allow trends without prior review" setting to include statuses (#17977)

Browse source 
* Change "Allow trends without prior review" setting to include posts

* Fix i18n-tasks
This commit is contained in:
Eugen Rochko 2022-08-28 04:00:39 +02:00 • committed by GitHub
parent c57907737a
commit 546672e292
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/javascript/styles/mastodon/accounts.scss
View file

@ -202,7 +202,8 @@
}
.account-role,
.simple_form .recommended {
.simple_form .recommended,
.simple_form .not_recommended {
display: inline-block;
padding: 4px 6px;
cursor: default;
@ -227,6 +228,12 @@
}
}
.simple_form .not_recommended {
color: lighten($error-red, 12%);
background-color: rgba(lighten($error-red, 12%), 0.1);
border-color: rgba(lighten($error-red, 12%), 0.5);
}
.account__header__fields {
max-width: 100vw;
padding: 0;

3
app/javascript/styles/mastodon/forms.scss
View file

@ -102,7 +102,8 @@ code {
}
}
.recommended {
.recommended,
.not_recommended {
position: absolute;
margin: 0 4px;
margin-top: -2px;

4
app/models/account.rb
View file

@ -258,6 +258,10 @@ class Account < ApplicationRecord
update!(memorial: true)
end
def trendable
boolean_with_default('trendable', Setting.trendable_by_default)
end
def sign?
true
end

2
app/views/admin/settings/edit.html.haml
View file

@ -81,7 +81,7 @@
= f.input :trends, as: :boolean, wrapper: :with_label, label: t('admin.settings.trends.title'), hint: t('admin.settings.trends.desc_html')
.fields-group
= f.input :trendable_by_default, as: :boolean, wrapper: :with_label, label: t('admin.settings.trendable_by_default.title'), hint: t('admin.settings.trendable_by_default.desc_html')
= f.input :trendable_by_default, as: :boolean, wrapper: :with_label, label: t('admin.settings.trendable_by_default.title'), hint: t('admin.settings.trendable_by_default.desc_html'), recommended: :not_recommended
.fields-group
= f.input :noindex, as: :boolean, wrapper: :with_label, label: t('admin.settings.default_noindex.title'), hint: t('admin.settings.default_noindex.desc_html')