diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-01-08 01:24:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-08 01:24:06 +0100 |
| commit | cec7e698275f7f3a8d88ddf205a0c04d6adb13cd (patch) | |
| tree | 9592c4f96154796c66f4f7ba3241427da07b1390 | |
| parent | 679aa35e152d690ab8460d8c819c9496b2061ed8 (diff) | |
| parent | e1ca3549561b133a5c878f5f8ace2c8d2dec4eee (diff) | |
Merge pull request #430 from blackle/logout_mobile
Show logout button on getting started so it's available on mobile
| -rw-r--r-- | app/assets/javascripts/components/features/getting_started/index.jsx | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/components/features/ui/components/column_link.jsx | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/assets/javascripts/components/features/getting_started/index.jsx b/app/assets/javascripts/components/features/getting_started/index.jsx index 8f56ba39f..8b4096b34 100644 --- a/app/assets/javascripts/components/features/getting_started/index.jsx +++ b/app/assets/javascripts/components/features/getting_started/index.jsx @@ -9,7 +9,8 @@ const messages = defineMessages({ heading: { id: 'getting_started.heading', defaultMessage: 'Getting started' }, public_timeline: { id: 'navigation_bar.public_timeline', defaultMessage: 'Public timeline' }, preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' }, - follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' } + follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' }, + sign_out: { id: 'navigation_bar.logout', defaultMessage: 'Sign out' } }); const mapStateToProps = state => ({ @@ -28,6 +29,7 @@ const GettingStarted = ({ intl, me }) => { <div style={{ position: 'relative' }}> <ColumnLink icon='globe' text={intl.formatMessage(messages.public_timeline)} to='/timelines/public' /> <ColumnLink icon='cog' text={intl.formatMessage(messages.preferences)} href='/settings/preferences' /> + <ColumnLink icon='sign-out' text={intl.formatMessage(messages.sign_out)} href='/auth/sign_out' method='delete' /> {followRequests} </div> diff --git a/app/assets/javascripts/components/features/ui/components/column_link.jsx b/app/assets/javascripts/components/features/ui/components/column_link.jsx index a2f7c13a6..901a29f5c 100644 --- a/app/assets/javascripts/components/features/ui/components/column_link.jsx +++ b/app/assets/javascripts/components/features/ui/components/column_link.jsx @@ -13,10 +13,10 @@ const iconStyle = { marginRight: '5px' }; -const ColumnLink = ({ icon, text, to, href }) => { +const ColumnLink = ({ icon, text, to, href, method }) => { if (href) { return ( - <a href={href} style={outerStyle} className='column-link'> + <a href={href} style={outerStyle} className='column-link' data-method={method}> <i className={`fa fa-fw fa-${icon}`} style={iconStyle} /> {text} </a> |