logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: c5a08eb56e11175630014837b41e17d72f0a67a1
parent: 920ba5fc4e705ea9418d2cab12e4d2ffd53775de
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Sun,  5 Feb 2017 19:22:05 +0100

Add link to blocked users to getting started page

Diffstat:

Mapp/assets/javascripts/components/features/blocks/index.jsx2+-
Mapp/assets/javascripts/components/features/getting_started/index.jsx4+++-
2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/components/features/blocks/index.jsx b/app/assets/javascripts/components/features/blocks/index.jsx @@ -10,7 +10,7 @@ import { fetchBlocks, expandBlocks } from '../../actions/blocks'; import { defineMessages, injectIntl } from 'react-intl'; const messages = defineMessages({ - heading: { id: 'column.blocks', defaultMessage: 'Blocked' } + heading: { id: 'column.blocks', defaultMessage: 'Blocked users' } }); const mapStateToProps = state => ({ diff --git a/app/assets/javascripts/components/features/getting_started/index.jsx b/app/assets/javascripts/components/features/getting_started/index.jsx @@ -11,7 +11,8 @@ const messages = defineMessages({ preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' }, follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' }, sign_out: { id: 'navigation_bar.logout', defaultMessage: 'Sign out' }, - favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' } + favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' }, + blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' } }); const mapStateToProps = state => ({ @@ -32,6 +33,7 @@ const GettingStarted = ({ intl, me }) => { <ColumnLink icon='cog' text={intl.formatMessage(messages.preferences)} href='/settings/preferences' /> <ColumnLink icon='star' text={intl.formatMessage(messages.favourites)} to='/favourites' /> {followRequests} + <ColumnLink icon='users' text={intl.formatMessage(messages.blocks)} to='/blocks' /> <ColumnLink icon='sign-out' text={intl.formatMessage(messages.sign_out)} href='/auth/sign_out' method='delete' /> </div>