diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-05-09 17:43:30 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-05-10 00:03:28 +0200 |
commit | 1c9c0167b7ea7dd03ef233a085adc0a6ef1b2527 (patch) | |
tree | ccfcb53c4ddb61d7ef3158d29403ff7cd6516e55 /app/views/accounts/_header.html.haml | |
parent | 143878d9dadd03347c54c9261b9bc754a1d0f5bc (diff) | |
parent | ac788ad47e32a3cf84a46ac87f84f376185cdad4 (diff) |
Merge branch 'master' into glitch-soc/master
Conflicts: app/models/account.rb app/views/accounts/_header.html.haml
Diffstat (limited to 'app/views/accounts/_header.html.haml')
-rw-r--r-- | app/views/accounts/_header.html.haml | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml index af79922c2..652213526 100644 --- a/app/views/accounts/_header.html.haml +++ b/app/views/accounts/_header.html.haml @@ -6,11 +6,16 @@ .card__bio %h1.name - %span.p-name.emojify= display_name(account) + %span.p-name.emojify= display_name(account, custom_emojify: true) %small< %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 @@ -21,19 +26,19 @@ = t 'accounts.roles.moderator' .bio .account__header__content.p-note.emojify!=processed_bio[:text] + - if !account.fields.empty? - %table.account__header__fields - %tbody - - account.fields.each do |field| - %tr - %th.emojify= field.name - %td.emojify= Formatter.instance.format_field(account, field.value) + .account__header__fields + - account.fields.each do |field| + %dl + %dt.emojify{ title: field.name }= field.name + %dd.emojify{ title: field.value }= Formatter.instance.format_field(account, field.value, custom_emojify: true) - elsif processed_bio[:metadata].length > 0 - %table.account__header__fields< + .account__header__fields - processed_bio[:metadata].each do |i| - %tr - %th.emojify>!=i[0] - %td.emojify>!=i[1] + %dl + %dt.emojify{ title: i[0] }= i[0] + %dd.emojify{ title: i[1] }= i[1] .details-counters .counter{ class: active_nav_class(short_account_url(account)) } |