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

1 files changed, 151 insertions, 669 deletions

diff --git a/webapp/components/admin_console/image_settings.jsx b/webapp/components/admin_console/image_settings.jsx
index 64a7663c6..86d8795cc 100644
--- a/webapp/components/admin_console/image_settings.jsx
+++ b/webapp/components/admin_console/image_settings.jsx
@@ -1,692 +1,174 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import $ from 'jquery';
-import ReactDOM from 'react-dom';
-import Client from 'utils/web_client.jsx';
-import * as AsyncClient from 'utils/async_client.jsx';
-import crypto from 'crypto';
-
-import {injectIntl, intlShape, defineMessages, FormattedMessage} from 'react-intl';
+import React from 'react';
 
-const holders = defineMessages({
-    storeLocal: {
-        id: 'admin.image.storeLocal',
-        defaultMessage: 'Local File System'
-    },
-    storeAmazonS3: {
-        id: 'admin.image.storeAmazonS3',
-        defaultMessage: 'Amazon S3'
-    },
-    localExample: {
-        id: 'admin.image.localExample',
-        defaultMessage: 'Ex "./data/"'
-    },
-    amazonS3IdExample: {
-        id: 'admin.image.amazonS3IdExample',
-        defaultMessage: 'Ex "AKIADTOVBGERKLCBV"'
-    },
-    amazonS3SecretExample: {
-        id: 'admin.image.amazonS3SecretExample',
-        defaultMessage: 'Ex "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"'
-    },
-    amazonS3BucketExample: {
-        id: 'admin.image.amazonS3BucketExample',
-        defaultMessage: 'Ex "mattermost-media"'
-    },
-    amazonS3RegionExample: {
-        id: 'admin.image.amazonS3RegionExample',
-        defaultMessage: 'Ex "us-east-1"'
-    },
-    thumbWidthExample: {
-        id: 'admin.image.thumbWidthExample',
-        defaultMessage: 'Ex "120"'
-    },
-    thumbHeightExample: {
-        id: 'admin.image.thumbHeightExample',
-        defaultMessage: 'Ex "100"'
-    },
-    previewWidthExample: {
-        id: 'admin.image.previewWidthExample',
-        defaultMessage: 'Ex "1024"'
-    },
-    previewHeightExample: {
-        id: 'admin.image.previewHeightExample',
-        defaultMessage: 'Ex "0"'
-    },
-    profileWidthExample: {
-        id: 'admin.image.profileWidthExample',
-        defaultMessage: 'Ex "1024"'
-    },
-    profileHeightExample: {
-        id: 'admin.image.profileHeightExample',
-        defaultMessage: 'Ex "0"'
-    },
-    publicLinkExample: {
-        id: 'admin.image.publicLinkExample',
-        defaultMessage: 'Ex "gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6"'
-    },
-    saving: {
-        id: 'admin.image.saving',
-        defaultMessage: 'Saving Config...'
-    }
-});
+import * as Utils from 'utils/utils.jsx';
 
-import React from 'react';
+import AdminSettings from './admin_settings.jsx';
+import {FormattedMessage} from 'react-intl';
+import SettingsGroup from './settings_group.jsx';
+import TextSetting from './text_setting.jsx';
 
-class FileSettings extends React.Component {
+export default class ImageSettings extends AdminSettings {
     constructor(props) {
         super(props);
 
-        this.handleChange = this.handleChange.bind(this);
-        this.handleSubmit = this.handleSubmit.bind(this);
-        this.handleGenerate = this.handleGenerate.bind(this);
-
-        this.state = {
-            saveNeeded: false,
-            serverError: null,
-            DriverName: this.props.config.FileSettings.DriverName
-        };
-    }
+        this.getConfigFromState = this.getConfigFromState.bind(this);
 
-    handleChange(action) {
-        var s = {saveNeeded: true, serverError: this.state.serverError};
+        this.renderSettings = this.renderSettings.bind(this);
 
-        if (action === 'DriverName') {
-            s.DriverName = ReactDOM.findDOMNode(this.refs.DriverName).value;
-        }
-
-        this.setState(s);
-    }
-
-    handleGenerate(e) {
-        e.preventDefault();
-        ReactDOM.findDOMNode(this.refs.PublicLinkSalt).value = crypto.randomBytes(256).toString('base64').substring(0, 32);
-        var s = {saveNeeded: true, serverError: this.state.serverError};
-        this.setState(s);
+        this.state = Object.assign(this.state, {
+            thumbnailWidth: props.config.FileSettings.ThumbnailWidth,
+            thumbnailHeight: props.config.FileSettings.ThumbnailHeight,
+            profileWidth: props.config.FileSettings.ProfileWidth,
+            profileHeight: props.config.FileSettings.ProfileHeight,
+            previewWidth: props.config.FileSettings.PreviewWidth,
+            previewHeight: props.config.FileSettings.PreviewHeight
+        });
     }
 
-    handleSubmit(e) {
-        e.preventDefault();
-        $('#save-button').button('loading');
-
-        var config = this.props.config;
-        config.FileSettings.DriverName = ReactDOM.findDOMNode(this.refs.DriverName).value;
-        config.FileSettings.Directory = ReactDOM.findDOMNode(this.refs.Directory).value;
-        config.FileSettings.AmazonS3AccessKeyId = ReactDOM.findDOMNode(this.refs.AmazonS3AccessKeyId).value;
-        config.FileSettings.AmazonS3SecretAccessKey = ReactDOM.findDOMNode(this.refs.AmazonS3SecretAccessKey).value;
-        config.FileSettings.AmazonS3Bucket = ReactDOM.findDOMNode(this.refs.AmazonS3Bucket).value;
-        config.FileSettings.AmazonS3Region = ReactDOM.findDOMNode(this.refs.AmazonS3Region).value;
-        config.FileSettings.EnablePublicLink = ReactDOM.findDOMNode(this.refs.EnablePublicLink).checked;
-
-        config.FileSettings.PublicLinkSalt = ReactDOM.findDOMNode(this.refs.PublicLinkSalt).value.trim();
+    getConfigFromState(config) {
+        config.FileSettings.ThumbnailWidth = this.parseInt(this.state.thumbnailWidth);
+        config.FileSettings.ThumbnailHeight = this.parseInt(this.state.thumbnailHeight);
+        config.FileSettings.ProfileWidth = this.parseInt(this.state.profileWidth);
+        config.FileSettings.ProfileHeight = this.parseInt(this.state.profileHeight);
+        config.FileSettings.PreviewWidth = this.parseInt(this.state.previewWidth);
+        config.FileSettings.PreviewHeight = this.parseInt(this.state.previewHeight);
 
-        if (config.FileSettings.PublicLinkSalt === '') {
-            config.FileSettings.PublicLinkSalt = crypto.randomBytes(256).toString('base64').substring(0, 32);
-            ReactDOM.findDOMNode(this.refs.PublicLinkSalt).value = config.FileSettings.PublicLinkSalt;
-        }
-
-        var thumbnailWidth = 120;
-        if (!isNaN(parseInt(ReactDOM.findDOMNode(this.refs.ThumbnailWidth).value, 10))) {
-            thumbnailWidth = parseInt(ReactDOM.findDOMNode(this.refs.ThumbnailWidth).value, 10);
-        }
-        config.FileSettings.ThumbnailWidth = thumbnailWidth;
-        ReactDOM.findDOMNode(this.refs.ThumbnailWidth).value = thumbnailWidth;
-
-        var thumbnailHeight = 100;
-        if (!isNaN(parseInt(ReactDOM.findDOMNode(this.refs.ThumbnailHeight).value, 10))) {
-            thumbnailHeight = parseInt(ReactDOM.findDOMNode(this.refs.ThumbnailHeight).value, 10);
-        }
-        config.FileSettings.ThumbnailHeight = thumbnailHeight;
-        ReactDOM.findDOMNode(this.refs.ThumbnailHeight).value = thumbnailHeight;
-
-        var previewWidth = 1024;
-        if (!isNaN(parseInt(ReactDOM.findDOMNode(this.refs.PreviewWidth).value, 10))) {
-            previewWidth = parseInt(ReactDOM.findDOMNode(this.refs.PreviewWidth).value, 10);
-        }
-        config.FileSettings.PreviewWidth = previewWidth;
-        ReactDOM.findDOMNode(this.refs.PreviewWidth).value = previewWidth;
-
-        var previewHeight = 0;
-        if (!isNaN(parseInt(ReactDOM.findDOMNode(this.refs.PreviewHeight).value, 10))) {
-            previewHeight = parseInt(ReactDOM.findDOMNode(this.refs.PreviewHeight).value, 10);
-        }
-        config.FileSettings.PreviewHeight = previewHeight;
-        ReactDOM.findDOMNode(this.refs.PreviewHeight).value = previewHeight;
-
-        var profileWidth = 128;
-        if (!isNaN(parseInt(ReactDOM.findDOMNode(this.refs.ProfileWidth).value, 10))) {
-            profileWidth = parseInt(ReactDOM.findDOMNode(this.refs.ProfileWidth).value, 10);
-        }
-        config.FileSettings.ProfileWidth = profileWidth;
-        ReactDOM.findDOMNode(this.refs.ProfileWidth).value = profileWidth;
-
-        var profileHeight = 128;
-        if (!isNaN(parseInt(ReactDOM.findDOMNode(this.refs.ProfileHeight).value, 10))) {
-            profileHeight = parseInt(ReactDOM.findDOMNode(this.refs.ProfileHeight).value, 10);
-        }
-        config.FileSettings.ProfileHeight = profileHeight;
-        ReactDOM.findDOMNode(this.refs.ProfileHeight).value = profileHeight;
+        return config;
+    }
 
-        Client.saveConfig(
-            config,
-            () => {
-                AsyncClient.getConfig();
-                this.setState({
-                    serverError: null,
-                    saveNeeded: false
-                });
-                $('#save-button').button('reset');
-            },
-            (err) => {
-                this.setState({
-                    serverError: err.message,
-                    saveNeeded: true
-                });
-                $('#save-button').button('reset');
-            }
+    renderTitle() {
+        return (
+            <h3>
+                <FormattedMessage
+                    id='admin.files.title'
+                    defaultMessage='File Settings'
+                />
+            </h3>
         );
     }
 
-    render() {
-        const {formatMessage} = this.props.intl;
-        var serverError = '';
-        if (this.state.serverError) {
-            serverError = <div className='form-group has-error'><label className='control-label'>{this.state.serverError}</label></div>;
-        }
-
-        var saveClass = 'btn';
-        if (this.state.saveNeeded) {
-            saveClass = 'btn btn-primary';
-        }
-
-        var enableFile = false;
-        var enableS3 = false;
-
-        if (this.state.DriverName === 'local') {
-            enableFile = true;
-        }
-
-        if (this.state.DriverName === 'amazons3') {
-            enableS3 = true;
-        }
-
+    renderSettings() {
         return (
-            <div className='wrapper--fixed'>
-                <h3>
+            <SettingsGroup
+                header={
                     <FormattedMessage
-                        id='admin.image.fileSettings'
-                        defaultMessage='File Settings'
+                        id='admin.files.images'
+                        defaultMessage='Images'
                     />
-                </h3>
-                <form
-                    className='form-horizontal'
-                    role='form'
-                >
-
-                    <div className='form-group'>
-                        <label
-                            className='control-label col-sm-4'
-                            htmlFor='DriverName'
-                        >
-                            <FormattedMessage
-                                id='admin.image.storeTitle'
-                                defaultMessage='Store Files In:'
-                            />
-                        </label>
-                        <div className='col-sm-8'>
-                            <select
-                                className='form-control'
-                                id='DriverName'
-                                ref='DriverName'
-                                defaultValue={this.props.config.FileSettings.DriverName}
-                                onChange={this.handleChange.bind(this, 'DriverName')}
-                            >
-                                <option value='local'>{formatMessage(holders.storeLocal)}</option>
-                                <option value='amazons3'>{formatMessage(holders.storeAmazonS3)}</option>
-                            </select>
-                        </div>
-                    </div>
-
-                    <div className='form-group'>
-                        <label
-                            className='control-label col-sm-4'
-                            htmlFor='Directory'
-                        >
-                            <FormattedMessage
-                                id='admin.image.localTitle'
-                                defaultMessage='Local Directory Location:'
-                            />
-                        </label>
-                        <div className='col-sm-8'>
-                            <input
-                                type='text'
-                                className='form-control'
-                                id='Directory'
-                                ref='Directory'
-                                placeholder={formatMessage(holders.localExample)}
-                                defaultValue={this.props.config.FileSettings.Directory}
-                                onChange={this.handleChange}
-                                disabled={!enableFile}
-                            />
-                            <p className='help-text'>
-                                <FormattedMessage
-                                    id='admin.image.localDescription'
-                                    defaultMessage='Directory to which image files are written. If blank, will be set to ./data/.'
-                                />
-                            </p>
-                        </div>
-                    </div>
-
-                    <div className='form-group'>
-                        <label
-                            className='control-label col-sm-4'
-                            htmlFor='AmazonS3AccessKeyId'
-                        >
-                            <FormattedMessage
-                                id='admin.image.amazonS3IdTitle'
-                                defaultMessage='Amazon S3 Access Key Id:'
-                            />
-                        </label>
-                        <div className='col-sm-8'>
-                            <input
-                                type='text'
-                                className='form-control'
-                                id='AmazonS3AccessKeyId'
-                                ref='AmazonS3AccessKeyId'
-                                placeholder={formatMessage(holders.amazonS3IdExample)}
-                                defaultValue={this.props.config.FileSettings.AmazonS3AccessKeyId}
-                                onChange={this.handleChange}
-                                disabled={!enableS3}
-                            />
-                            <p className='help-text'>
-                                <FormattedMessage
-                                    id='admin.image.amazonS3IdDescription'
-                                    defaultMessage='Obtain this credential from your Amazon EC2 administrator.'
-                                />
-                            </p>
-                        </div>
-                    </div>
-
-                    <div className='form-group'>
-                        <label
-                            className='control-label col-sm-4'
-                            htmlFor='AmazonS3SecretAccessKey'
-                        >
-                            <FormattedMessage
-                                id='admin.image.amazonS3SecretTitle'
-                                defaultMessage='Amazon S3 Secret Access Key:'
-                            />
-                        </label>
-                        <div className='col-sm-8'>
-                            <input
-                                type='text'
-                                className='form-control'
-                                id='AmazonS3SecretAccessKey'
-                                ref='AmazonS3SecretAccessKey'
-                                placeholder={formatMessage(holders.amazonS3SecretExample)}
-                                defaultValue={this.props.config.FileSettings.AmazonS3SecretAccessKey}
-                                onChange={this.handleChange}
-                                disabled={!enableS3}
-                            />
-                            <p className='help-text'>
-                                <FormattedMessage
-                                    id='admin.image.amazonS3SecretDescription'
-                                    defaultMessage='Obtain this credential from your Amazon EC2 administrator.'
-                                />
-                            </p>
-                        </div>
-                    </div>
-
-                    <div className='form-group'>
-                        <label
-                            className='control-label col-sm-4'
-                            htmlFor='AmazonS3Bucket'
-                        >
-                            <FormattedMessage
-                                id='admin.image.amazonS3BucketTitle'
-                                defaultMessage='Amazon S3 Bucket:'
-                            />
-                        </label>
-                        <div className='col-sm-8'>
-                            <input
-                                type='text'
-                                className='form-control'
-                                id='AmazonS3Bucket'
-                                ref='AmazonS3Bucket'
-                                placeholder={formatMessage(holders.amazonS3BucketExample)}
-                                defaultValue={this.props.config.FileSettings.AmazonS3Bucket}
-                                onChange={this.handleChange}
-                                disabled={!enableS3}
-                            />
-                            <p className='help-text'>
-                                <FormattedMessage
-                                    id='admin.image.amazonS3BucketDescription'
-                                    defaultMessage='Name you selected for your S3 bucket in AWS.'
-                                />
-                            </p>
-                        </div>
-                    </div>
-
-                    <div className='form-group'>
-                        <label
-                            className='control-label col-sm-4'
-                            htmlFor='AmazonS3Region'
-                        >
-                            <FormattedMessage
-                                id='admin.image.amazonS3RegionTitle'
-                                defaultMessage='Amazon S3 Region:'
-                            />
-                        </label>
-                        <div className='col-sm-8'>
-                            <input
-                                type='text'
-                                className='form-control'
-                                id='AmazonS3Region'
-                                ref='AmazonS3Region'
-                                placeholder={formatMessage(holders.amazonS3RegionExample)}
-                                defaultValue={this.props.config.FileSettings.AmazonS3Region}
-                                onChange={this.handleChange}
-                                disabled={!enableS3}
-                            />
-                            <p className='help-text'>
-                                <FormattedMessage
-                                    id='admin.image.amazonS3RegionDescription'
-                                    defaultMessage='AWS region you selected for creating your S3 bucket.'
-                                />
-                            </p>
-                        </div>
-                    </div>
-
-                    <div className='form-group'>
-                        <label
-                            className='control-label col-sm-4'
-                            htmlFor='ThumbnailWidth'
-                        >
-                            <FormattedMessage
-                                id='admin.image.thumbWidthTitle'
-                                defaultMessage='Thumbnail Width:'
-                            />
-                        </label>
-                        <div className='col-sm-8'>
-                            <input
-                                type='text'
-                                className='form-control'
-                                id='ThumbnailWidth'
-                                ref='ThumbnailWidth'
-                                placeholder={formatMessage(holders.thumbWidthExample)}
-                                defaultValue={this.props.config.FileSettings.ThumbnailWidth}
-                                onChange={this.handleChange}
-                            />
-                            <p className='help-text'>
-                                <FormattedMessage
-                                    id='admin.image.thumbWidthDescription'
-                                    defaultMessage='Width of thumbnails generated from uploaded images. Updating this value changes how thumbnail images render in future, but does not change images created in the past.'
-                                />
-                            </p>
-                        </div>
-                    </div>
-
-                    <div className='form-group'>
-                        <label
-                            className='control-label col-sm-4'
-                            htmlFor='ThumbnailHeight'
-                        >
-                            <FormattedMessage
-                                id='admin.image.thumbHeightTitle'
-                                defaultMessage='Thumbnail Height:'
-                            />
-                        </label>
-                        <div className='col-sm-8'>
-                            <input
-                                type='text'
-                                className='form-control'
-                                id='ThumbnailHeight'
-                                ref='ThumbnailHeight'
-                                placeholder={formatMessage(holders.thumbHeightExample)}
-                                defaultValue={this.props.config.FileSettings.ThumbnailHeight}
-                                onChange={this.handleChange}
-                            />
-                            <p className='help-text'>
-                                <FormattedMessage
-                                    id='admin.image.thumbHeightDescription'
-                                    defaultMessage='Height of thumbnails generated from uploaded images. Updating this value changes how thumbnail images render in future, but does not change images created in the past.'
-                                />
-                            </p>
-                        </div>
-                    </div>
-
-                    <div className='form-group'>
-                        <label
-                            className='control-label col-sm-4'
-                            htmlFor='PreviewWidth'
-                        >
-                            <FormattedMessage
-                                id='admin.image.previewWidthTitle'
-                                defaultMessage='Preview Width:'
-                            />
-                        </label>
-                        <div className='col-sm-8'>
-                            <input
-                                type='text'
-                                className='form-control'
-                                id='PreviewWidth'
-                                ref='PreviewWidth'
-                                placeholder={formatMessage(holders.previewWidthExample)}
-                                defaultValue={this.props.config.FileSettings.PreviewWidth}
-                                onChange={this.handleChange}
-                            />
-                            <p className='help-text'>
-                                <FormattedMessage
-                                    id='admin.image.previewWidthDescription'
-                                    defaultMessage='Maximum width of preview image. Updating this value changes how preview images render in future, but does not change images created in the past.'
-                                />
-                            </p>
-                        </div>
-                    </div>
-
-                    <div className='form-group'>
-                        <label
-                            className='control-label col-sm-4'
-                            htmlFor='PreviewHeight'
-                        >
-                            <FormattedMessage
-                                id='admin.image.previewHeightTitle'
-                                defaultMessage='Preview Height:'
-                            />
-                        </label>
-                        <div className='col-sm-8'>
-                            <input
-                                type='text'
-                                className='form-control'
-                                id='PreviewHeight'
-                                ref='PreviewHeight'
-                                placeholder={formatMessage(holders.previewHeightExample)}
-                                defaultValue={this.props.config.FileSettings.PreviewHeight}
-                                onChange={this.handleChange}
-                            />
-                            <p className='help-text'>
-                                <FormattedMessage
-                                    id='admin.image.previewHeightDescription'
-                                    defaultMessage='Maximum height of preview image ("0": Sets to auto-size). Updating this value changes how preview images render in future, but does not change images created in the past.'
-                                />
-                            </p>
-                        </div>
-                    </div>
-
-                    <div className='form-group'>
-                        <label
-                            className='control-label col-sm-4'
-                            htmlFor='ProfileWidth'
-                        >
-                            <FormattedMessage
-                                id='admin.image.profileWidthTitle'
-                                defaultMessage='Profile Width:'
-                            />
-                        </label>
-                        <div className='col-sm-8'>
-                            <input
-                                type='text'
-                                className='form-control'
-                                id='ProfileWidth'
-                                ref='ProfileWidth'
-                                placeholder={formatMessage(holders.profileWidthExample)}
-                                defaultValue={this.props.config.FileSettings.ProfileWidth}
-                                onChange={this.handleChange}
-                            />
-                            <p className='help-text'>
-                                <FormattedMessage
-                                    id='admin.image.profileWidthDescription'
-                                    defaultMessage='Width of profile picture.'
-                                />
-                            </p>
-                        </div>
-                    </div>
-
-                    <div className='form-group'>
-                        <label
-                            className='control-label col-sm-4'
-                            htmlFor='ProfileHeight'
-                        >
-                            <FormattedMessage
-                                id='admin.image.profileHeightTitle'
-                                defaultMessage='Profile Height:'
-                            />
-                        </label>
-                        <div className='col-sm-8'>
-                            <input
-                                type='text'
-                                className='form-control'
-                                id='ProfileHeight'
-                                ref='ProfileHeight'
-                                placeholder={formatMessage(holders.profileHeightExample)}
-                                defaultValue={this.props.config.FileSettings.ProfileHeight}
-                                onChange={this.handleChange}
-                            />
-                            <p className='help-text'>
-                                <FormattedMessage
-                                    id='admin.image.profileHeightDescription'
-                                    defaultMessage='Height of profile picture.'
-                                />
-                            </p>
-                        </div>
-                    </div>
-
-                    <div className='form-group'>
-                        <label
-                            className='control-label col-sm-4'
-                            htmlFor='EnablePublicLink'
-                        >
-                            <FormattedMessage
-                                id='admin.image.shareTitle'
-                                defaultMessage='Share Public File Link: '
-                            />
-                        </label>
-                        <div className='col-sm-8'>
-                            <label className='radio-inline'>
-                                <input
-                                    type='radio'
-                                    name='EnablePublicLink'
-                                    value='true'
-                                    ref='EnablePublicLink'
-                                    defaultChecked={this.props.config.FileSettings.EnablePublicLink}
-                                    onChange={this.handleChange}
-                                />
-                                <FormattedMessage
-                                    id='admin.image.true'
-                                    defaultMessage='true'
-                                />
-                            </label>
-                            <label className='radio-inline'>
-                                <input
-                                    type='radio'
-                                    name='EnablePublicLink'
-                                    value='false'
-                                    defaultChecked={!this.props.config.FileSettings.EnablePublicLink}
-                                    onChange={this.handleChange}
-                                />
-                                <FormattedMessage
-                                    id='admin.image.false'
-                                    defaultMessage='false'
-                                />
-                            </label>
-                            <p className='help-text'>
-                                <FormattedMessage
-                                    id='admin.image.shareDescription'
-                                    defaultMessage='Allow users to share public links to files and images.'
-                                />
-                            </p>
-                        </div>
-                    </div>
-
-                    <div className='form-group'>
-                        <label
-                            className='control-label col-sm-4'
-                            htmlFor='PublicLinkSalt'
-                        >
-                            <FormattedMessage
-                                id='admin.image.publicLinkTitle'
-                                defaultMessage='Public Link Salt:'
-                            />
-                        </label>
-                        <div className='col-sm-8'>
-                            <input
-                                type='text'
-                                className='form-control'
-                                id='PublicLinkSalt'
-                                ref='PublicLinkSalt'
-                                placeholder={formatMessage(holders.publicLinkExample)}
-                                defaultValue={this.props.config.FileSettings.PublicLinkSalt}
-                                onChange={this.handleChange}
-                            />
-                            <p className='help-text'>
-                                <FormattedMessage
-                                    id='admin.image.publicLinkDescription'
-                                    defaultMessage='32-character salt added to signing of public image links. Randomly generated on install. Click "Re-Generate" to create new salt.'
-                                />
-                            </p>
-                            <div className='help-text'>
-                                <button
-                                    className='btn btn-default'
-                                    onClick={this.handleGenerate}
-                                >
-                                    <FormattedMessage
-                                        id='admin.image.regenerate'
-                                        defaultMessage='Re-Generate'
-                                    />
-                                </button>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div className='form-group'>
-                        <div className='col-sm-12'>
-                            {serverError}
-                            <button
-                                disabled={!this.state.saveNeeded}
-                                type='submit'
-                                className={saveClass}
-                                onClick={this.handleSubmit}
-                                id='save-button'
-                                data-loading-text={'<span class=\'glyphicon glyphicon-refresh glyphicon-refresh-animate\'></span> ' + formatMessage(holders.saving)}
-                            >
-                                <FormattedMessage
-                                    id='admin.image.save'
-                                    defaultMessage='Save'
-                                />
-                            </button>
-                        </div>
-                    </div>
-
-                </form>
-            </div>
+                }
+            >
+                <TextSetting
+                    id='thumbnailWidth'
+                    label={
+                        <FormattedMessage
+                            id='admin.image.thumbWidthTitle'
+                            defaultMessage='Thumbnail Width:'
+                        />
+                    }
+                    placeholder={Utils.localizeMessage('admin.image.thumbWidthExample', 'Ex "120"')}
+                    helpText={
+                        <FormattedMessage
+                            id='admin.image.thumbWidthDescription'
+                            defaultMessage='Width of thumbnails generated from uploaded images. Updating this value changes how thumbnail images render in future, but does not change images created in the past.'
+                        />
+                    }
+                    value={this.state.thumbnailWidth}
+                    onChange={this.handleChange}
+                />
+                <TextSetting
+                    id='thumbnailHeight'
+                    label={
+                        <FormattedMessage
+                            id='admin.image.thumbHeightTitle'
+                            defaultMessage='Thumbnail Height:'
+                        />
+                    }
+                    placeholder={Utils.localizeMessage('admin.image.thumbHeightExample', 'Ex "100"')}
+                    helpText={
+                        <FormattedMessage
+                            id='admin.image.thumbHeightDescription'
+                            defaultMessage='Height of thumbnails generated from uploaded images. Updating this value changes how thumbnail images render in future, but does not change images created in the past.'
+                        />
+                    }
+                    value={this.state.thumbnailHeight}
+                    onChange={this.handleChange}
+                />
+                <TextSetting
+                    id='profileWidth'
+                    label={
+                        <FormattedMessage
+                            id='admin.image.profileWidthTitle'
+                            defaultMessage='Profile Width:'
+                        />
+                    }
+                    placeholder={Utils.localizeMessage('admin.image.profileWidthExample', 'Ex "1024"')}
+                    helpText={
+                        <FormattedMessage
+                            id='admin.image.profileWidthDescription'
+                            defaultMessage='Width of profile picture.'
+                        />
+                    }
+                    value={this.state.profileWidth}
+                    onChange={this.handleChange}
+                />
+                <TextSetting
+                    id='profileHeight'
+                    label={
+                        <FormattedMessage
+                            id='admin.image.profileHeightTitle'
+                            defaultMessage='Profile Height:'
+                        />
+                    }
+                    placeholder={Utils.localizeMessage('admin.image.profileHeightExample', 'Ex "0"')}
+                    helpText={
+                        <FormattedMessage
+                            id='admin.image.profileHeightDescription'
+                            defaultMessage='Height of profile picture.'
+                        />
+                    }
+                    value={this.state.profileHeight}
+                    onChange={this.handleChange}
+                />
+                <TextSetting
+                    id='previewWidth'
+                    label={
+                        <FormattedMessage
+                            id='admin.image.previewWidthTitle'
+                            defaultMessage='Preview Width:'
+                        />
+                    }
+                    placeholder={Utils.localizeMessage('admin.image.previewWidthExample', 'Ex "1024"')}
+                    helpText={
+                        <FormattedMessage
+                            id='admin.image.previewWidthDescription'
+                            defaultMessage='Maximum width of preview image. Updating this value changes how preview images render in future, but does not change images created in the past.'
+                        />
+                    }
+                    value={this.state.previewWidth}
+                    onChange={this.handleChange}
+                />
+                <TextSetting
+                    id='previewHeight'
+                    label={
+                        <FormattedMessage
+                            id='admin.image.previewHeightTitle'
+                            defaultMessage='Preview Height:'
+                        />
+                    }
+                    placeholder={Utils.localizeMessage('admin.image.previewHeightExample', 'Ex "0"')}
+                    helpText={
+                        <FormattedMessage
+                            id='admin.image.previewHeightDescription'
+                            defaultMessage='Maximum height of preview image ("0": Sets to auto-size). Updating this value changes how preview images render in future, but does not change images created in the past.'
+                        />
+                    }
+                    value={this.state.previewHeight}
+                    onChange={this.handleChange}
+                />
+            </SettingsGroup>
         );
     }
-}
-
-FileSettings.propTypes = {
-    intl: intlShape.isRequired,
-    config: React.PropTypes.object
-};
-
-export default injectIntl(FileSettings);
+}
\ No newline at end of file