diff options
Diffstat (limited to 'webapp/components')
-rw-r--r-- | webapp/components/admin_console/admin_sidebar.jsx | 10 | ||||
-rw-r--r-- | webapp/components/admin_console/admin_sidebar_section.jsx | 4 | ||||
-rw-r--r-- | webapp/components/admin_console/image_settings.jsx | 167 | ||||
-rw-r--r-- | webapp/components/setting_picture.jsx | 7 |
4 files changed, 7 insertions, 181 deletions
diff --git a/webapp/components/admin_console/admin_sidebar.jsx b/webapp/components/admin_console/admin_sidebar.jsx index 05924d02f..d64d5edee 100644 --- a/webapp/components/admin_console/admin_sidebar.jsx +++ b/webapp/components/admin_console/admin_sidebar.jsx @@ -529,6 +529,7 @@ export default class AdminSidebar extends React.Component { } > <AdminSidebarSection + key='storage' name='storage' title={ <FormattedMessage @@ -537,15 +538,6 @@ export default class AdminSidebar extends React.Component { /> } /> - <AdminSidebarSection - name='images' - title={ - <FormattedMessage - id='admin.sidebar.images' - defaultMessage='Images' - /> - } - /> </AdminSidebarSection> <AdminSidebarSection name='customization' diff --git a/webapp/components/admin_console/admin_sidebar_section.jsx b/webapp/components/admin_console/admin_sidebar_section.jsx index e0f327da0..2a8ecab71 100644 --- a/webapp/components/admin_console/admin_sidebar_section.jsx +++ b/webapp/components/admin_console/admin_sidebar_section.jsx @@ -16,7 +16,7 @@ export default class AdminSidebarSection extends React.Component { type: PropTypes.string, parentLink: PropTypes.string, subsection: PropTypes.bool, - children: PropTypes.arrayOf(PropTypes.element), + children: PropTypes.node, action: PropTypes.node, onlyActiveOnIndex: PropTypes.bool }; @@ -39,7 +39,7 @@ export default class AdminSidebarSection extends React.Component { const link = this.getLink(); let clonedChildren = null; - if (this.props.children.length > 0) { + if (this.props.children) { clonedChildren = ( <ul className='nav nav__sub-menu subsections'> { diff --git a/webapp/components/admin_console/image_settings.jsx b/webapp/components/admin_console/image_settings.jsx deleted file mode 100644 index 94f893ee2..000000000 --- a/webapp/components/admin_console/image_settings.jsx +++ /dev/null @@ -1,167 +0,0 @@ -// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. -// See License.txt for license information. - -import React from 'react'; - -import * as Utils from 'utils/utils.jsx'; - -import AdminSettings from './admin_settings.jsx'; -import {FormattedMessage} from 'react-intl'; -import SettingsGroup from './settings_group.jsx'; -import TextSetting from './text_setting.jsx'; - -export default class ImageSettings extends AdminSettings { - constructor(props) { - super(props); - - this.getConfigFromState = this.getConfigFromState.bind(this); - - this.renderSettings = this.renderSettings.bind(this); - } - - 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); - - return config; - } - - getStateFromConfig(config) { - return { - thumbnailWidth: config.FileSettings.ThumbnailWidth, - thumbnailHeight: config.FileSettings.ThumbnailHeight, - profileWidth: config.FileSettings.ProfileWidth, - profileHeight: config.FileSettings.ProfileHeight, - previewWidth: config.FileSettings.PreviewWidth, - previewHeight: config.FileSettings.PreviewHeight - }; - } - - renderTitle() { - return ( - <FormattedMessage - id='admin.files.images' - defaultMessage='Images' - /> - ); - } - - renderSettings() { - return ( - <SettingsGroup> - <TextSetting - id='thumbnailWidth' - label={ - <FormattedMessage - id='admin.image.thumbWidthTitle' - defaultMessage='Attachment 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='Attachment 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 Picture 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 Picture 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='Image 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='Image 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> - ); - } -} diff --git a/webapp/components/setting_picture.jsx b/webapp/components/setting_picture.jsx index 2d389a902..faa463cc7 100644 --- a/webapp/components/setting_picture.jsx +++ b/webapp/components/setting_picture.jsx @@ -7,9 +7,10 @@ import React, {Component} from 'react'; import {FormattedMessage} from 'react-intl'; import FormError from 'components/form_error.jsx'; - import loadingGif from 'images/load.gif'; +import Constants from 'utils/constants.jsx'; + export default class SettingPicture extends Component { static propTypes = { clientError: PropTypes.string, @@ -114,8 +115,8 @@ export default class SettingPicture extends Component { id='setting_picture.help' defaultMessage='Upload a profile picture in BMP, JPG, JPEG or PNG format, at least {width}px in width and {height}px height.' values={{ - width: global.mm_config.ProfileWidth, - height: global.mm_config.ProfileHeight + width: Constants.PROFILE_WIDTH, + height: Constants.PROFILE_WIDTH }} /> </li> |