diff options
| author | Greg Roach <fisharebest@gmail.com> | 2016-01-15 16:09:39 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2016-01-15 16:09:39 +0000 |
| commit | 5e257c9c18f4167089a11510f2da24031dab01b5 (patch) | |
| tree | 78f8ed96e14ff3bcafd751cbcb468bd8da1e019a | |
| parent | 2e8014937eee9a30938ee06c5b44483750324537 (diff) | |
| download | webtrees-5e257c9c18f4167089a11510f2da24031dab01b5.tar.gz webtrees-5e257c9c18f4167089a11510f2da24031dab01b5.tar.bz2 webtrees-5e257c9c18f4167089a11510f2da24031dab01b5.zip | |
Fix #799 - Palette menu
| -rw-r--r-- | app/Theme/ColorsTheme.php | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/app/Theme/ColorsTheme.php b/app/Theme/ColorsTheme.php index a077dbe09f..87b32dbfa6 100644 --- a/app/Theme/ColorsTheme.php +++ b/app/Theme/ColorsTheme.php @@ -144,17 +144,22 @@ class ColorsTheme extends CloudsTheme implements ThemeInterface { * @return Menu */ protected function menuPalette() { - $menu = new Menu(/* I18N: A colour scheme */ I18N::translate('Palette'), '#', 'menu-color'); + if ($this->tree && Site::getPreference('ALLOW_USER_THEMES') && $this->tree->getPreference('ALLOW_THEME_DROPDOWN')) { + $menu = new Menu(/* I18N: A colour scheme */ + I18N::translate('Palette'), '#', 'menu-color'); - foreach ($this->palettes as $palette_id => $palette_name) { - $menu->addSubmenu(new Menu( - $palette_name, - Functions::getQueryUrl(array('themecolor' => $palette_id), '&'), - 'menu-color-' . $palette_id . ($this->palette === $palette_id ? ' active' : '') - )); - } + foreach ($this->palettes as $palette_id => $palette_name) { + $menu->addSubmenu(new Menu( + $palette_name, + Functions::getQueryUrl(array('themecolor' => $palette_id), '&'), + 'menu-color-' . $palette_id . ($this->palette === $palette_id ? ' active' : '') + )); + } - return $menu; + return $menu; + } else { + return null; + } } /** |