diff options
Diffstat (limited to 'webapp/components/admin_console/connection_security_dropdown_setting.jsx')
-rw-r--r-- | webapp/components/admin_console/connection_security_dropdown_setting.jsx | 114 |
1 files changed, 56 insertions, 58 deletions
diff --git a/webapp/components/admin_console/connection_security_dropdown_setting.jsx b/webapp/components/admin_console/connection_security_dropdown_setting.jsx index 02b56b192..b3e9ac31c 100644 --- a/webapp/components/admin_console/connection_security_dropdown_setting.jsx +++ b/webapp/components/admin_console/connection_security_dropdown_setting.jsx @@ -8,63 +8,62 @@ import DropdownSetting from './dropdown_setting.jsx'; import {FormattedMessage} from 'react-intl'; const CONNECTION_SECURITY_HELP_TEXT = ( - <div className='help-text'> - <table - className='table table-bordered table-margin--none' - cellPadding='5' - > - <tbody> - <tr> - <td className='help-text'> - <FormattedMessage - id='admin.connectionSecurityNone' - defaultMessage='None' - /> - </td> - <td className='help-text'> - <FormattedMessage - id='admin.connectionSecurityNoneDescription' - defaultMessage='Mattermost will connect over an unsecure connection.' - /> - </td> - </tr> - <tr> - <td className='help-text'> - <FormattedMessage - id='admin.connectionSecurityTls' - defaultMessage='TLS' - /> - </td> - <td className='help-text'> - <FormattedMessage - id='admin.connectionSecurityTlsDescription' - defaultMessage='Encrypts the communication between Mattermost and your server.' - /> - </td> - </tr> - <tr> - <td className='help-text'> - <FormattedMessage - id='admin.connectionSecurityStart' - defaultMessage='STARTTLS' - /> - </td> - <td className='help-text'> - <FormattedMessage - id='admin.connectionSecurityStartDescription' - defaultMessage='Takes an existing insecure connection and attempts to upgrade it to a secure connection using TLS.' - /> - </td> - </tr> - </tbody> - </table> - </div> + <table + className='table table-bordered table-margin--none' + cellPadding='5' + > + <tbody> + <tr> + <td className='help-text'> + <FormattedMessage + id='admin.connectionSecurityNone' + defaultMessage='None' + /> + </td> + <td className='help-text'> + <FormattedMessage + id='admin.connectionSecurityNoneDescription' + defaultMessage='Mattermost will connect over an unsecure connection.' + /> + </td> + </tr> + <tr> + <td className='help-text'> + <FormattedMessage + id='admin.connectionSecurityTls' + defaultMessage='TLS' + /> + </td> + <td className='help-text'> + <FormattedMessage + id='admin.connectionSecurityTlsDescription' + defaultMessage='Encrypts the communication between Mattermost and your server.' + /> + </td> + </tr> + <tr> + <td className='help-text'> + <FormattedMessage + id='admin.connectionSecurityStart' + defaultMessage='STARTTLS' + /> + </td> + <td className='help-text'> + <FormattedMessage + id='admin.connectionSecurityStartDescription' + defaultMessage='Takes an existing insecure connection and attempts to upgrade it to a secure connection using TLS.' + /> + </td> + </tr> + </tbody> + </table> ); export default class ConnectionSecurityDropdownSetting extends React.Component { render() { return ( <DropdownSetting + id='connectionSecurity' values={[ {value: '', text: Utils.localizeMessage('admin.connectionSecurityNone', 'None')}, {value: 'TLS', text: Utils.localizeMessage('admin.connectionSecurityTls', 'TLS (Recommended)')}, @@ -76,11 +75,10 @@ export default class ConnectionSecurityDropdownSetting extends React.Component { defaultMessage='Connection Security:' /> } - currentValue={this.props.currentValue} - handleChange={this.props.handleChange} - isDisabled={this.props.isDisabled} + value={this.props.value} + onChange={this.props.onChange} + disabled={this.props.disabled} helpText={CONNECTION_SECURITY_HELP_TEXT} - margin='small' /> ); } @@ -89,7 +87,7 @@ ConnectionSecurityDropdownSetting.defaultProps = { }; ConnectionSecurityDropdownSetting.propTypes = { - currentValue: React.PropTypes.string.isRequired, - handleChange: React.PropTypes.func.isRequired, - isDisabled: React.PropTypes.bool.isRequired + value: React.PropTypes.string.isRequired, + onChange: React.PropTypes.func.isRequired, + disabled: React.PropTypes.bool.isRequired }; |