diff options
author | David Lu <david.lu97@outlook.com> | 2016-10-11 09:06:47 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-10-11 09:06:47 -0400 |
commit | 6e9e41ebb500e0d343374421719f24c515958808 (patch) | |
tree | 04df18daf4b50b2b66e07443c16d0efaec30b8b0 /webapp/components/admin_console/custom_brand_settings.jsx | |
parent | 78a4b19fd7094b3b00fad1ee47d89e6e4e3cdb99 (diff) | |
download | chat-6e9e41ebb500e0d343374421719f24c515958808.tar.gz chat-6e9e41ebb500e0d343374421719f24c515958808.tar.bz2 chat-6e9e41ebb500e0d343374421719f24c515958808.zip |
Improvements to Custom Branding (#4177)
Diffstat (limited to 'webapp/components/admin_console/custom_brand_settings.jsx')
-rw-r--r-- | webapp/components/admin_console/custom_brand_settings.jsx | 50 |
1 files changed, 24 insertions, 26 deletions
diff --git a/webapp/components/admin_console/custom_brand_settings.jsx b/webapp/components/admin_console/custom_brand_settings.jsx index a54768fb8..ee8e464da 100644 --- a/webapp/components/admin_console/custom_brand_settings.jsx +++ b/webapp/components/admin_console/custom_brand_settings.jsx @@ -25,9 +25,9 @@ export default class CustomBrandSettings extends AdminSettings { getConfigFromState(config) { config.TeamSettings.SiteName = this.state.siteName; if (global.window.mm_license.IsLicensed === 'true' && global.window.mm_license.CustomBrand === 'true') { + config.TeamSettings.customDescriptionText = this.state.customDescriptionText; config.TeamSettings.EnableCustomBrand = this.state.enableCustomBrand; config.TeamSettings.CustomBrandText = this.state.customBrandText; - config.TeamSettings.customDescriptionText = this.state.customDescriptionText; } return config; @@ -57,6 +57,28 @@ export default class CustomBrandSettings extends AdminSettings { const enterpriseSettings = []; if (global.window.mm_license.IsLicensed === 'true' && global.window.mm_license.CustomBrand === 'true') { enterpriseSettings.push( + <TextSetting + key='customDescriptionText' + id='customDescriptionText' + label={ + <FormattedMessage + id='admin.team.brandDescriptionTitle' + defaultMessage='Site Description: ' + /> + } + helpText={ + <FormattedMessage + id='admin.team.brandDescriptionHelp' + defaultMessage='Description of service shown in login screens and UI. When not specified, "All team communication in one place, searchable and accessible anywhere" is displayed.' + /> + } + value={this.state.customDescriptionText} + placeholder={Utils.localizeMessage('web.root.signup_info', 'All team communication in one place, searchable and accessible anywhere')} + onChange={this.handleChange} + /> + ); + + enterpriseSettings.push( <BooleanSetting key='enableCustomBrand' id='enableCustomBrand' @@ -98,7 +120,7 @@ export default class CustomBrandSettings extends AdminSettings { helpText={ <FormattedMessage id='admin.team.brandTextDescription' - defaultMessage='The custom branding Markdown-formatted text you would like to appear below your custom brand image on your login sreen.' + defaultMessage='Text that will appear below your custom brand image on your login screen. Supports Markdown-formatted text. Maximum 500 characters allowed.' /> } value={this.state.customBrandText} @@ -106,30 +128,6 @@ export default class CustomBrandSettings extends AdminSettings { disabled={!this.state.enableCustomBrand} /> ); - - enterpriseSettings.push( - <TextSetting - key='customDescriptionText' - id='customDescriptionText' - type='textarea' - label={ - <FormattedMessage - id='admin.team.brandDescriptionTitle' - defaultMessage='Site Description' - /> - } - helpText={ - <FormattedMessage - id='admin.team.brandDescriptionHelp' - defaultMessage='Description of service shown in login screens and UI.' - /> - } - value={this.state.customDescriptionText} - placeholder={Utils.localizeMessage('web.root.signup_info', 'All team communication in one place, searchable and accessible anywhere')} - onChange={this.handleChange} - disabled={!this.state.enableCustomBrand} - /> - ); } return ( |