diff options
author | JoramWilander <jwawilander@gmail.com> | 2016-06-13 15:29:24 -0400 |
---|---|---|
committer | JoramWilander <jwawilander@gmail.com> | 2016-06-13 15:29:24 -0400 |
commit | 5af526c259d9c6477d67eb8f8a1e7b86270c7294 (patch) | |
tree | 97cc595107026a1f19d6fd6e35627dda23979aa3 /webapp/components/admin_console/admin_sidebar.jsx | |
parent | bb5ca5a8780f9259306d881e85760de8b87ddea8 (diff) | |
parent | 974238231b9cdbd39a825ec8e9299fbb0b51f6b8 (diff) | |
download | chat-5af526c259d9c6477d67eb8f8a1e7b86270c7294.tar.gz chat-5af526c259d9c6477d67eb8f8a1e7b86270c7294.tar.bz2 chat-5af526c259d9c6477d67eb8f8a1e7b86270c7294.zip |
Merge branch 'release-3.1'
Conflicts:
webapp/components/create_comment.jsx
Diffstat (limited to 'webapp/components/admin_console/admin_sidebar.jsx')
-rw-r--r-- | webapp/components/admin_console/admin_sidebar.jsx | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/webapp/components/admin_console/admin_sidebar.jsx b/webapp/components/admin_console/admin_sidebar.jsx index d760e3db9..c947be5cb 100644 --- a/webapp/components/admin_console/admin_sidebar.jsx +++ b/webapp/components/admin_console/admin_sidebar.jsx @@ -239,6 +239,22 @@ export default class AdminSidebar extends React.Component { ); } + let customBranding = null; + + if (window.mm_license.IsLicensed === 'true') { + customBranding = ( + <AdminSidebarSection + name='custom_brand' + title={ + <FormattedMessage + id='admin.sidebar.customBrand' + defaultMessage='Custom Branding' + /> + } + /> + ); + } + return ( <div className='admin-sidebar'> <AdminSidebarHeader/> @@ -515,16 +531,7 @@ export default class AdminSidebar extends React.Component { /> } > - <AdminSidebarSection - name='custom_brand' - title={ - <FormattedMessage - id='admin.sidebar.customBrand' - defaultMessage='Custom Branding' - /> - - } - /> + {customBranding} <AdminSidebarSection name='legal_and_support' title={ |