about summary refs log tree commit diff
path: root/app/views
diff options
context:
space:
mode:
authorbeatrix <beatrix.bitrot@gmail.com>2018-05-06 11:32:05 -0400
committerGitHub <noreply@github.com>2018-05-06 11:32:05 -0400
commit35a1a3171fdf7f9f4e7a6c3086e12e68f336f64b (patch)
tree5ccb9de241bf26b8e214abe6c231ec07ac2b6f92 /app/views
parentaf4fb72993982bdc27a32a438502d493428cdce9 (diff)
parent356d0214c93da79f0583a62a6ca748828d721326 (diff)
Merge pull request #449 from ThibG/glitch-soc/features/upstream-account-items
Support upstream bio items / custom account fields
Diffstat (limited to 'app/views')
-rw-r--r--app/views/accounts/_header.html.haml15
1 files changed, 7 insertions, 8 deletions
diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml
index 76f29d591..af79922c2 100644
--- a/app/views/accounts/_header.html.haml
+++ b/app/views/accounts/_header.html.haml
@@ -21,20 +21,19 @@
             = t 'accounts.roles.moderator'
     .bio
       .account__header__content.p-note.emojify!=processed_bio[:text]
-      - if processed_bio[:metadata].length > 0
-        %table.metadata<
-          - processed_bio[:metadata].each do |i|
-            %tr.metadata-item><
-              %th.emojify>!=i[0]
-              %td.emojify>!=i[1]
-
-      - unless account.fields.empty?
+      - 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)
+      - elsif processed_bio[:metadata].length > 0
+        %table.account__header__fields<
+          - processed_bio[:metadata].each do |i|
+            %tr
+              %th.emojify>!=i[0]
+              %td.emojify>!=i[1]
 
     .details-counters
       .counter{ class: active_nav_class(short_account_url(account)) }