treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Move compose box options to their own page

remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
Thibaut Girka 2018-09-06 20:46:42 +02:00 committed by ThibG
parent b28cbb8b25
commit ba4521b175
2 changed files with 63 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/javascript/flavours/glitch/features/local_settings/navigation/index.js
View File

@ -10,6 +10,7 @@ import LocalSettingsNavigationItem from './item';
const messages = defineMessages({ const messages = defineMessages({
general: { id: 'settings.general', defaultMessage: 'General' }, general: { id: 'settings.general', defaultMessage: 'General' },
compose: { id: 'settings.compose_box_opts', defaultMessage: 'Compose box options' },
content_warnings: { id: 'settings.content_warnings', defaultMessage: 'Content Warnings' }, content_warnings: { id: 'settings.content_warnings', defaultMessage: 'Content Warnings' },
collapsed: { id: 'settings.collapsed_statuses', defaultMessage: 'Collapsed toots' }, collapsed: { id: 'settings.collapsed_statuses', defaultMessage: 'Collapsed toots' },
media: { id: 'settings.media', defaultMessage: 'Media' }, media: { id: 'settings.media', defaultMessage: 'Media' },
@ -43,31 +44,37 @@ export default class LocalSettingsNavigation extends React.PureComponent {
active={index === 1} active={index === 1}
index={1} index={1}
onNavigate={onNavigate} onNavigate={onNavigate}
title={intl.formatMessage(messages.content_warnings)} title={intl.formatMessage(messages.compose)}
/> />
<LocalSettingsNavigationItem <LocalSettingsNavigationItem
active={index === 2} active={index === 2}
index={2} index={2}
onNavigate={onNavigate} onNavigate={onNavigate}
title={intl.formatMessage(messages.collapsed)} title={intl.formatMessage(messages.content_warnings)}
/> />
<LocalSettingsNavigationItem <LocalSettingsNavigationItem
active={index === 3} active={index === 3}
index={3} index={3}
onNavigate={onNavigate} onNavigate={onNavigate}
title={intl.formatMessage(messages.media)} title={intl.formatMessage(messages.collapsed)}
/> />
<LocalSettingsNavigationItem <LocalSettingsNavigationItem
active={index === 4} active={index === 4}
href='/settings/preferences'
index={4} index={4}
onNavigate={onNavigate}
title={intl.formatMessage(messages.media)}
/>
<LocalSettingsNavigationItem
active={index === 5}
href='/settings/preferences'
index={5}
icon='cog' icon='cog'
title={intl.formatMessage(messages.preferences)} title={intl.formatMessage(messages.preferences)}
/> />
<LocalSettingsNavigationItem <LocalSettingsNavigationItem
active={index === 5} active={index === 6}
className='close' className='close'
index={5} index={6}
onNavigate={onClose} onNavigate={onClose}
title={intl.formatMessage(messages.close)} title={intl.formatMessage(messages.close)}
/> />

9
app/javascript/flavours/glitch/features/local_settings/page/index.js
View File

@ -74,8 +74,12 @@ export default class LocalSettingsPage extends React.PureComponent {
<FormattedMessage id='settings.navbar_under' defaultMessage='Navbar at the bottom (Mobile only)' /> <FormattedMessage id='settings.navbar_under' defaultMessage='Navbar at the bottom (Mobile only)' />
</LocalSettingsPageItem> </LocalSettingsPageItem>
</section> </section>
<section> </div>
<h2><FormattedMessage id='settings.compose_box_opts' defaultMessage='Compose box options' /></h2> ),
({ intl, onChange, settings }) => (
<div className='glitch local-settings_page compose_box_opts'>
<section>
<h1><FormattedMessage id='settings.compose_box_opts' defaultMessage='Compose box options' /></h1>
<LocalSettingsPageItem <LocalSettingsPageItem
settings={settings} settings={settings}
item={['always_show_spoilers_field']} item={['always_show_spoilers_field']}
@ -120,7 +124,6 @@ export default class LocalSettingsPage extends React.PureComponent {
> >
<FormattedMessage id='settings.side_arm_reply_mode' defaultMessage='When replying to a toot:' /> <FormattedMessage id='settings.side_arm_reply_mode' defaultMessage='When replying to a toot:' />
</LocalSettingsPageItem> </LocalSettingsPageItem>
</section>
</div> </div>
), ),
({ intl, onChange, settings }) => ( ({ intl, onChange, settings }) => (