From 1605fa5102e7d5d76a02456130097d3ab82c2a2b Mon Sep 17 00:00:00 2001 From: David Meza Date: Tue, 5 Sep 2017 19:28:46 -0500 Subject: Configs for themes in `Display Settings`: hide themes options, hide custom themes, specific list of themes (#7173) * Add configuration to enable or disable choosing themes in Display Settings. Only for Licensed servers. * Add configuration to enable or disable choosing custom themes in Display Settings. Only for Licensed servers. * Add configuration to enable or disable a specific list of themes to choose in Display Settings. Only for Licensed servers. * Added config value and logic for "DefaultTheme" * Fix problem with undefined values when the server is not licensed --- .../user_settings/user_settings_theme.jsx | 157 +++++++++++---------- 1 file changed, 81 insertions(+), 76 deletions(-) (limited to 'webapp/components/user_settings/user_settings_theme.jsx') diff --git a/webapp/components/user_settings/user_settings_theme.jsx b/webapp/components/user_settings/user_settings_theme.jsx index 4f39cffa9..871e3ccae 100644 --- a/webapp/components/user_settings/user_settings_theme.jsx +++ b/webapp/components/user_settings/user_settings_theme.jsx @@ -180,10 +180,11 @@ export default class ThemeSetting extends React.Component { } const displayCustom = this.state.type === 'custom'; + const allowCustomThemes = global.mm_config.AllowCustomThemes !== 'false'; let custom; let premade; - if (displayCustom) { + if (displayCustom && allowCustomThemes) { custom = (
- -
-
- ); + if (allowCustomThemes) { + inputs.push( +
+ +
+
+ ); + } inputs.push(premade); - inputs.push( -
- -
- ); - - inputs.push(custom); - - inputs.push( -
-
- - - -
- ); + + + ); - inputs.push( -
- +
+
+ + +
+ ); + + inputs.push( +
- - -
- ); + + + + + ); + } let allTeamsCheckbox = null; if (this.state.showAllTeamsCheckbox) { -- cgit v1.2.3-1-g7c22