tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix onboarding modal & add re-open button (#129)

Browse Source 
* Added a button to open the onboarding modal

* Fixed onboarding modal

* added a show-me-around getting-started menu button
This commit is contained in:
Ondřej Hruška
2017-08-08 21:42:29 +02:00
committed by GitHub
parent 4dc0ddc601
commit cb42dd8497
4 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/features/compose/components/compose_form.js
View File

@ -150,7 +150,7 @@ export default class ComposeForm extends ImmutablePureComponent {
render () {
const { intl, onPaste, showSearch } = this.props;
const disabled = this.props.is_submitting;
const maybeEye = this.props.advanced_options.get('do_not_federate') ? ' 👁️' : '';
const maybeEye = (this.props.advanced_options && this.props.advanced_options.do_not_federate) ? ' 👁️' : '';
const text = [this.props.spoiler_text, countableText(this.props.text), maybeEye].join('');
let publishText = '';

22
app/javascript/mastodon/features/getting_started/index.js
View File

@ -25,6 +25,7 @@ const messages = defineMessages({
blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },
info: { id: 'navigation_bar.info', defaultMessage: 'Extended information' },
show_me_around: { id: 'getting_started.onboarding', defaultMessage: 'Show me around' },
});
const mapStateToProps = state => ({
@ -48,6 +49,11 @@ export default class GettingStarted extends ImmutablePureComponent {
this.props.dispatch(openModal('SETTINGS', {}));
}
openOnboardingModal = (e) => {
e.preventDefault();
this.props.dispatch(openModal('ONBOARDING'));
}
render () {
const { intl, me, columns, multiColumn } = this.props;
@ -92,6 +98,7 @@ export default class GettingStarted extends ImmutablePureComponent {
{navItems}
<ColumnSubheading text={intl.formatMessage(messages.settings_subheading)} />
<ColumnLink icon='book' text={intl.formatMessage(messages.info)} href='/about/more' />
<ColumnLink icon='hand-o-right' text={intl.formatMessage(messages.show_me_around)} onClick={this.openOnboardingModal} />
<ColumnLink icon='cog' text={intl.formatMessage(messages.preferences)} href='/settings/preferences' />
<ColumnLink icon='cogs' text={intl.formatMessage(messages.settings)} onClick={this.openSettings} />
<ColumnLink icon='sign-out' text={intl.formatMessage(messages.sign_out)} href='/auth/sign_out' method='delete' />
@ -100,13 +107,24 @@ export default class GettingStarted extends ImmutablePureComponent {
<div className='getting-started__footer'>
<div className='static-content getting-started'>
<p>
<a href='https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/FAQ.md' rel='noopener' target='_blank'><FormattedMessage id='getting_started.faq' defaultMessage='FAQ' /></a> • <a href='https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/User-guide.md' rel='noopener' target='_blank'><FormattedMessage id='getting_started.userguide' defaultMessage='User Guide' /></a> • <a href='https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md' rel='noopener' target='_blank'><FormattedMessage id='getting_started.appsshort' defaultMessage='Apps' /></a>
<a href='https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/FAQ.md' rel='noopener' target='_blank'>
<FormattedMessage id='getting_started.faq' defaultMessage='FAQ' />
</a>&nbsp;•&nbsp;
<a href='https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/User-guide.md' rel='noopener' target='_blank'>
<FormattedMessage id='getting_started.userguide' defaultMessage='User Guide' />
</a>&nbsp;•&nbsp;
<a href='https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md' rel='noopener' target='_blank'>
<FormattedMessage id='getting_started.appsshort' defaultMessage='Apps' />
</a>
</p>
<p>
<FormattedMessage
id='getting_started.open_source_notice'
defaultMessage='Glitchsoc is open source software, a friendly fork of {Mastodon}. You can contribute or report issues on GitHub at {github}.'
values={{ github: <a href='https://github.com/glitch-soc/mastodon' rel='noopener' target='_blank'>glitch-soc/mastodon</a>, Mastodon: <a href='https://github.com/tootsuite/mastodon' rel='noopener' target='_blank'>Mastodon</a> }}
values={{
github: <a href='https://github.com/glitch-soc/mastodon' rel='noopener' target='_blank'>glitch-soc/mastodon</a>,
Mastodon: <a href='https://github.com/tootsuite/mastodon' rel='noopener' target='_blank'>Mastodon</a>,
}}
/>
</p>
</div>

4
app/javascript/mastodon/features/ui/components/onboarding_modal.js
View File

@ -44,7 +44,7 @@ const PageTwo = ({ me }) => (
<div className='onboarding-modal__page onboarding-modal__page-two'>
<div className='figure non-interactive'>
<div className='pseudo-drawer'>
<NavigationBar account={me} />
<NavigationBar onClose={noop} account={me} />
</div>
<ComposeForm
text='Awoo! #introductions'
@ -83,7 +83,7 @@ const PageThree = ({ me }) => (
/>
<div className='pseudo-drawer'>
<NavigationBar account={me} />
<NavigationBar onClose={noop} account={me} />
</div>
</div>