diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-03-20 13:54:00 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-20 13:54:00 +0100 |
| commit | 1d6152f4404d40a6113bad2e70326fb5c2145ef4 (patch) | |
| tree | 4edcc500883b3e533c06517b147bf221b06f6bf0 /app/views/accounts | |
| parent | b9a998f201913dd1c89ddcb0c4c9e181eb73bfcf (diff) | |
| parent | 158c31b9df538691666e5b91f48a0afecd2985fe (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - config/locales/en.yml Conflict caused by the glitch-soc-specific “flavour” string being too close to the newly introduced “identity_proofs” string. Just included both.
Diffstat (limited to 'app/views/accounts')
| -rw-r--r-- | app/views/accounts/_bio.html.haml | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/app/views/accounts/_bio.html.haml b/app/views/accounts/_bio.html.haml index 2ea34a048..efc26d136 100644 --- a/app/views/accounts/_bio.html.haml +++ b/app/views/accounts/_bio.html.haml @@ -1,7 +1,17 @@ +- proofs = account.identity_proofs.active +- fields = account.fields + .public-account-bio - - unless account.fields.empty? + - unless fields.empty? && proofs.empty? .account__header__fields - - account.fields.each do |field| + - proofs.each do |proof| + %dl + %dt= proof.provider.capitalize + %dd.verified + = link_to fa_icon('check'), proof.badge.proof_url, class: 'verified__mark', title: t('accounts.link_verified_on', date: l(proof.updated_at)) + = link_to proof.provider_username, proof.badge.profile_url + + - fields.each do |field| %dl %dt.emojify{ title: field.name }= Formatter.instance.format_field(account, field.name, custom_emojify: true) %dd{ title: field.value, class: custom_field_classes(field) } @@ -9,6 +19,7 @@ %span.verified__mark{ title: t('accounts.link_verified_on', date: l(field.verified_at)) } = fa_icon 'check' = Formatter.instance.format_field(account, field.value, custom_emojify: true) + = account_badge(account) - if account.note.present? |