PLT-2257 Reorganized System Console (#3003)

* Reorganized system console

* Fixed the names of some components

* Fixed timestamp for BrandImageSetting

* Fixed merge issues

* Updated push notification settings to match master branch

* Removed top level setting pages and moved enable Gitlab/LDAP settings onto their respective pages

* Re-added restrictDirectMessage setting to system console

* Re-added email connection test and fixed some margins

* Fixed ESLint errors

* Renamed Authentication > Onboarding to Authentication > Email in the system console

* Renamed Customization > Whitelabeling to Customization > Custom Branding in System Console

* Re-added EnableOpenServer to system console
Этот коммит содержится в:
Harrison Healey
2016-05-17 07:21:39 -04:00
коммит произвёл Christopher Speller
родитель 5f5f813387
Коммит fd53e3b786
57 изменённых файлов: 5754 добавлений и 6631 удалений

Просмотреть файл

@@ -8,16 +8,43 @@ import Setting from './setting.jsx';
import {FormattedMessage} from 'react-intl';
export default class BooleanSetting extends React.Component {
constructor(props) {
super(props);
this.handleChange = this.handleChange.bind(this);
}
handleChange(e) {
this.props.onChange(this.props.id, e.target.value === 'true');
}
render() {
let helpText;
if (this.props.disabled && this.props.disabledText) {
helpText = (
<div>
<span className='admin-console__disabled-text'>
{this.props.disabledText}
</span>
{this.props.helpText}
</div>
);
} else {
helpText = this.props.helpText;
}
return (
<Setting label={this.props.label}>
<Setting
label={this.props.label}
helpText={helpText}
>
<label className='radio-inline'>
<input
type='radio'
value='true'
checked={this.props.currentValue}
onChange={this.props.handleChange}
disabled={this.props.isDisabled}
checked={this.props.value}
onChange={this.handleChange}
disabled={this.props.disabled}
/>
{this.props.trueText}
</label>
@@ -25,13 +52,12 @@ export default class BooleanSetting extends React.Component {
<input
type='radio'
value='false'
checked={!this.props.currentValue}
onChange={this.props.handleChange}
disabled={this.props.isDisabled}
checked={!this.props.value}
onChange={this.handleChange}
disabled={this.props.disabled}
/>
{this.props.falseText}
</label>
{this.props.helpText}
</Setting>
);
}
@@ -48,15 +74,18 @@ BooleanSetting.defaultProps = {
id='admin.ldap.false'
defaultMessage='false'
/>
)
),
disabled: false
};
BooleanSetting.propTypes = {
id: React.PropTypes.string.isRequired,
label: React.PropTypes.node.isRequired,
currentValue: React.PropTypes.bool.isRequired,
value: React.PropTypes.bool.isRequired,
onChange: React.PropTypes.func.isRequired,
trueText: React.PropTypes.node,
falseText: React.PropTypes.node,
isDisabled: React.PropTypes.bool.isRequired,
handleChange: React.PropTypes.func.isRequired,
disabled: React.PropTypes.bool.isRequired,
disabledText: React.PropTypes.node,
helpText: React.PropTypes.node.isRequired
};