From 4c170d2a98e4a289ad40580785cbeb892bd68eab Mon Sep 17 00:00:00 2001 From: multiple creatures Date: Sat, 13 Apr 2019 16:59:21 -0500 Subject: Add options to increase size and spacing of context menus and to gently the kobolds. Also allow showing multiple user roles. --- app/helpers/stream_entries_helper.rb | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'app/helpers') diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb index 07901889d..f3848f3be 100644 --- a/app/helpers/stream_entries_helper.rb +++ b/app/helpers/stream_entries_helper.rb @@ -35,18 +35,23 @@ module StreamEntriesHelper end def account_badge(account, all: false) - if account.bot? - content_tag(:div, content_tag(:div, t('accounts.roles.bot'), class: 'account-role bot'), class: 'roles') - elsif (Setting.show_staff_badge && account.user_staff?) || all - content_tag(:div, class: 'roles') do + content_tag(:div, class: 'roles') do + roles = [] + roles << content_tag(:div, t('accounts.roles.bot'), class: 'account-role bot') if account.bot? + roles << content_tag(:div, t('accounts.roles.gentlies_kobolds'), class: 'account-role gentlies') if account&.user&.setting_gently_kobolds + roles << content_tag(:div, t('accounts.roles.kobold'), class: 'account-role kobold') if account&.user&.setting_user_is_kobold + + if (Setting.show_staff_badge && account.user_staff?) || all if all && !account.user_staff? - content_tag(:div, t('admin.accounts.roles.user'), class: 'account-role') + roles << content_tag(:div, t('admin.accounts.roles.user'), class: 'account-role') elsif account.user_admin? - content_tag(:div, t('accounts.roles.admin'), class: 'account-role admin') + roles << content_tag(:div, t('accounts.roles.admin'), class: 'account-role admin') elsif account.user_moderator? - content_tag(:div, t('accounts.roles.moderator'), class: 'account-role moderator') + roles << content_tag(:div, t('accounts.roles.moderator'), class: 'account-role moderator') end end + + roles.sum end end -- cgit