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
Этот коммит содержится в:
коммит произвёл
Christopher Speller
родитель
5f5f813387
Коммит
fd53e3b786
@@ -5,20 +5,19 @@ import React from 'react';
|
||||
|
||||
export default class Setting extends React.Component {
|
||||
render() {
|
||||
let marginClass = '';
|
||||
if (this.props.margin === 'small') {
|
||||
marginClass = ' form-group--small';
|
||||
}
|
||||
|
||||
return (
|
||||
<div className={'form-group' + marginClass}>
|
||||
<div className='form-group'>
|
||||
<label
|
||||
className='control-label col-sm-4'
|
||||
htmlFor={this.props.inputId}
|
||||
>
|
||||
{this.props.label}
|
||||
</label>
|
||||
<div className='col-sm-8'>
|
||||
{this.props.children}
|
||||
<div className='help-text'>
|
||||
{this.props.helpText}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
@@ -28,7 +27,8 @@ Setting.defaultProps = {
|
||||
};
|
||||
|
||||
Setting.propTypes = {
|
||||
inputId: React.PropTypes.string,
|
||||
label: React.PropTypes.node.isRequired,
|
||||
children: React.PropTypes.node.isRequired,
|
||||
margin: React.PropTypes.oneOf(['', 'small'])
|
||||
helpText: React.PropTypes.node
|
||||
};
|
||||
|
||||
Ссылка в новой задаче
Block a user