diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-05-07 09:31:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-07 09:31:07 +0200 |
| commit | 42cd363542abf0a12a4e877b3ad26024f24577ef (patch) | |
| tree | b9539c370516cf0dcf1cc64b4975a1b6e84b9e56 /app/views | |
| parent | 0f0cc3f2eba9c8a701d735cd54206629eeea4ddb (diff) | |
Bot nameplates (#7391)
* Store actor type in database * Add bot nameplate to web UI, add setting to preferences, API, AP Fix #7365 * Fix code style issues
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/accounts/_header.html.haml | 6 | ||||
| -rw-r--r-- | app/views/settings/profiles/show.html.haml | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml index 13dcaf616..4098d6778 100644 --- a/app/views/accounts/_header.html.haml +++ b/app/views/accounts/_header.html.haml @@ -10,7 +10,11 @@ %span>< @#{account.local_username_and_domain} = fa_icon('lock') if account.locked? - - if Setting.show_staff_badge + - if account.bot? + .roles + .account-role.bot + = t 'accounts.roles.bot' + - elsif Setting.show_staff_badge - if account.user_admin? .roles .account-role.admin diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml index f28834d72..a84f8a7da 100644 --- a/app/views/settings/profiles/show.html.haml +++ b/app/views/settings/profiles/show.html.haml @@ -20,6 +20,9 @@ = f.input :locked, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.locked') .fields-group + = f.input :bot, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.bot') + + .fields-group .input.with_block_label %label= t('simple_form.labels.defaults.fields') %span.hint= t('simple_form.hints.defaults.fields') |