From 6e9e41ebb500e0d343374421719f24c515958808 Mon Sep 17 00:00:00 2001
From: David Lu <david.lu97@outlook.com>
Date: Tue, 11 Oct 2016 09:06:47 -0400
Subject: Improvements to Custom Branding (#4177)

---
 .../admin_console/custom_brand_settings.jsx        | 50 +++++++++++-----------
 1 file changed, 24 insertions(+), 26 deletions(-)

(limited to 'webapp/components/admin_console/custom_brand_settings.jsx')

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;
@@ -56,6 +56,28 @@ export default class CustomBrandSettings extends AdminSettings {
     renderSettings() {
         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'
@@ -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 (
-- 
cgit v1.2.3-1-g7c22

