bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-checked' into 'admin_cfg'

Browse source 
Fix checked, remove display name and bio, and comment out MAX_FIELDS in admin_cfg

See merge request soapbox-pub/soapbox-fe!107
This commit is contained in:
Curtis 2020-07-24 04:20:40 +00:00
commit d82fac50b0
1 changed files with 5 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
app/soapbox/features/configuration/index.js
View file

@ -186,25 +186,9 @@ class ConfigSoapbox extends ImmutablePureComponent {
<SimpleForm onSubmit={this.handleSubmit}>
<fieldset disabled={this.state.isLoading}>
<FieldsGroup>
<TextInput
label={<FormattedMessage id='soapbox_settings.fields.display_name_label' defaultMessage='Display name' />}
name='display_name'
value={this.state.display_name}
onChange={this.handleTextChange}
/>
<TextInput
label={<FormattedMessage id='soapbox_settings.fields.bio_label' defaultMessage='Bio' />}
name='note'
value={this.state.note}
onChange={this.handleTextChange}
/>
<div className='fields-row'>
<div className='fields-row__column fields-row__column-6'>
if ({this.state.logo}) {
<StillImage src={this.state.logo} />
} else {
<StillImage src={this.props.logo} />
};
{this.state.logo ? (<StillImage src={this.state.logo} />) : (<StillImage src={this.props.logo} />)}
</div>
<div className='fields-row__column fields-group fields-row__column-6'>
<FileChooser
@ -225,22 +209,14 @@ class ConfigSoapbox extends ImmutablePureComponent {
label={<FormattedMessage id='soapbox_settings.fields.patron_enabled_label' defaultMessage='Enable Patron module' />}
hint={<FormattedMessage id='soapbox_settings.hints.patron_enabled' defaultMessage='Enables display of Patron module. Requires installation of Patron module.' />}
name='patron_enabled'
if ({this.state.patronEnabled}) {
checked={this.state.patronEnabled}
} else {
checked={this.props.patronEnabled}
};
checked={this.state.patronEnabled ? this.state.patronEnabled : this.props.patronEnabled}
onChange={this.handleCheckboxChange}
/>
<Checkbox
label={<FormattedMessage id='soapbox_settings.fields.auto_play_gif_label' defaultMessage='Auto-play GIFs' />}
hint={<FormattedMessage id='soapbox_settings.hints.auto_play_gif' defaultMessage='Enable auto-playing of GIF files in timeline' />}
name='auto_play_gif'
if ({this.state.autoPlayGif}) {
checked={this.state.autoPlayGif}
} else {
checked={this.props.autoPlayGif}
};
checked={this.state.autoPlayGif ? this.state.autoPlayGif : this.props.autoPlayGif}
onChange={this.handleCheckboxChange}
/>
</FieldsGroup>
@ -249,7 +225,7 @@ class ConfigSoapbox extends ImmutablePureComponent {
<div className='input with_block_label'>
<label><FormattedMessage id='soapbox_settings.fields.meta_fields_label' defaultMessage='Profile metadata' /></label>
<span className='hint'>
<FormattedMessage id='soapbox_settings.hints.meta_fields' defaultMessage='You can have up to {count, plural, one {# item} other {# items}} displayed as a table on your profile' values={{ count: MAX_FIELDS }} />
<FormattedMessage id='soapbox_settings.hints.meta_fields' defaultMessage='You can have up to {count, plural, one {# item} other {# items}} displayed as a table on your profile' /* values={{ count: MAX_FIELDS }} */ />
</span>
{
this.state.promoItems.map((field, i) => (
@ -271,7 +247,7 @@ class ConfigSoapbox extends ImmutablePureComponent {
<div className='input with_block_label'>
<label><FormattedMessage id='soapbox_settings.fields.meta_fields_label' defaultMessage='Profile metadata' /></label>
<span className='hint'>
<FormattedMessage id='soapbox_settings.hints.meta_fields' defaultMessage='You can have up to {count, plural, one {# item} other {# items}} displayed as a table on your profile' values={{ count: MAX_FIELDS }} />
<FormattedMessage id='soapbox_settings.hints.meta_fields' defaultMessage='You can have up to {count, plural, one {# item} other {# items}} displayed as a table on your profile' /* values={{ count: MAX_FIELDS }} */ />
</span>
{
this.state.homeFooterItems.map((field, i) => (