diff options
| author | Fire Demon <firedemon@creature.cafe> | 2020-08-15 22:32:10 -0500 |
|---|---|---|
| committer | Fire Demon <firedemon@creature.cafe> | 2020-08-30 05:45:18 -0500 |
| commit | 0773647aee366ef5cc0df403e7ae6e5bd9b62481 (patch) | |
| tree | ccfa3b3f04232b4d8db36265afc9bfff45601fed | |
| parent | 405bdae4e8787b1b0155d5a3329ae19757c773f9 (diff) | |
[UI] Move mentions tab to middle position
| -rw-r--r-- | app/javascript/flavours/glitch/features/account_timeline/components/header.js | 2 | ||||
| -rw-r--r-- | app/views/accounts/show.html.haml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/features/account_timeline/components/header.js b/app/javascript/flavours/glitch/features/account_timeline/components/header.js index 9da86e09a..591f8dffc 100644 --- a/app/javascript/flavours/glitch/features/account_timeline/components/header.js +++ b/app/javascript/flavours/glitch/features/account_timeline/components/header.js @@ -125,9 +125,9 @@ export default class Header extends ImmutablePureComponent { {!hideTabs && ( <div className='account__section-headline'> <NavLink exact to={`/accounts/${account.get('id')}`}><FormattedMessage id='account.threads' defaultMessage='Threads' /></NavLink> - { (account.get('id') !== me) && (<NavLink exact to={`/accounts/${account.get('id')}/mentions`}><FormattedMessage id='account.mentions' defaultMessage='Mentions' /></NavLink>) } { (account.get('id') === me || account.get('show_replies')) && (<NavLink exact to={`/accounts/${account.get('id')}/with_replies`}><FormattedMessage id='account.posts_with_replies' defaultMessage='Toots with replies' /></NavLink>) } + { (account.get('id') !== me) && (<NavLink exact to={`/accounts/${account.get('id')}/mentions`}><FormattedMessage id='account.mentions' defaultMessage='Mentions' /></NavLink>) } <NavLink exact to={`/accounts/${account.get('id')}/media`}><FormattedMessage id='account.media' defaultMessage='Media' /></NavLink> <NavLink exact to={`/accounts/${account.get('id')}/reblogs`}><FormattedMessage id='account.reblogs' defaultMessage='Boosts' /></NavLink> </div> diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml index 3400bfcd5..3a6fca642 100644 --- a/app/views/accounts/show.html.haml +++ b/app/views/accounts/show.html.haml @@ -30,10 +30,10 @@ .account__section-headline = active_link_to t('accounts.posts_tab_heading'), short_account_url(@account) = active_link_to t('accounts.threads'), short_account_threads_url(@account) - - if current_account.present? && @account.id != current_account.id - = active_link_to t('accounts.mentions'), short_account_mentions_url(@account) - if @account.show_replies? = active_link_to t('accounts.posts_with_replies'), short_account_with_replies_url(@account) + - if current_account.present? && @account.id != current_account.id + = active_link_to t('accounts.mentions'), short_account_mentions_url(@account) = active_link_to t('accounts.media'), short_account_media_url(@account) = active_link_to t('accounts.reblogs'), short_account_reblogs_url(@account) |