diff options
author | David Yip <yipdw@member.fsf.org> | 2018-04-14 09:12:50 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-04-14 09:12:50 -0500 |
commit | 813da6788e5129579db04e89aac3076902af2c7a (patch) | |
tree | 2c7c8435e4eae5baa4b6169973c8da4644d44ded /app/javascript/mastodon/features/account/components/header.js | |
parent | e3d0d72b299103d30fcda2b7175906c73c1571bc (diff) | |
parent | 78ed4ab75ff77d7cba60d478aa1f45d1c104785d (diff) |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: db/schema.rb
Diffstat (limited to 'app/javascript/mastodon/features/account/components/header.js')
-rw-r--r-- | app/javascript/mastodon/features/account/components/header.js | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/app/javascript/mastodon/features/account/components/header.js b/app/javascript/mastodon/features/account/components/header.js index bb7b3b632..bbf886dca 100644 --- a/app/javascript/mastodon/features/account/components/header.js +++ b/app/javascript/mastodon/features/account/components/header.js @@ -130,6 +130,7 @@ export default class Header extends ImmutablePureComponent { const content = { __html: account.get('note_emojified') }; const displayNameHtml = { __html: account.get('display_name_html') }; + const fields = account.get('fields'); return ( <div className={classNames('account__header', { inactive: !!account.get('moved') })} style={{ backgroundImage: `url(${account.get('header')})` }}> @@ -140,6 +141,19 @@ export default class Header extends ImmutablePureComponent { <span className='account__header__username'>@{account.get('acct')} {lockedIcon}</span> <div className='account__header__content' dangerouslySetInnerHTML={content} /> + {fields.size > 0 && ( + <table className='account__header__fields'> + <tbody> + {fields.map((pair, i) => ( + <tr key={i}> + <th dangerouslySetInnerHTML={{ __html: pair.get('name_emojified') }} /> + <td dangerouslySetInnerHTML={{ __html: pair.get('value_emojified') }} /> + </tr> + ))} + </tbody> + </table> + )} + {info} {mutingInfo} {actionBtn} |