diff --git a/config/packages/twig.yaml b/config/packages/twig.yaml index 18de5917..7bfb15c8 100644 --- a/config/packages/twig.yaml +++ b/config/packages/twig.yaml @@ -18,6 +18,7 @@ twig: sidebar_items: '%partdb.sidebar.items%' sidebar_tree_updater: '@App\Services\Trees\SidebarTreeUpdater' avatar_helper: '@App\Services\UserSystem\UserAvatarHelper' + available_themes: '%partdb.available_themes%' when@test: twig: diff --git a/config/parameters.yaml b/config/parameters.yaml index 0d49ba9f..ec80e939 100644 --- a/config/parameters.yaml +++ b/config/parameters.yaml @@ -55,6 +55,37 @@ parameters: ###################################################################################################################### partdb.demo_mode: '%env(bool:DEMO_MODE)%' # If set to true, all potentially dangerous things are disabled (like changing passwords of the own user) + # Set the themes from which the user can choose from in the settings. + # Themes commented here by default, are not really usable, because of display problems. Enable them at your own risk! + partdb.available_themes: + - bootstrap + - cerulean + - cosmo + - cyborg + - darkly + - flatly + - journal + - litera + - lumen + - lux + #- materia + - minty + #- morph + #- pulse + #- quartz + - sandstone + - simplex + - sketchy + - slate + - solar + - spacelab + - superhero + - united + #- vapor + - yeti + - zephyr + + ###################################################################################################################### # Env default values ###################################################################################################################### diff --git a/config/services.yaml b/config/services.yaml index aa1be89e..c6f30003 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -186,6 +186,10 @@ services: arguments: $use_gravatar: '%partdb.users.use_gravatar%' + App\Form\Type\ThemeChoiceType: + arguments: + $available_themes: '%partdb.available_themes%' + #################################################################################################################### # Label system diff --git a/src/Entity/UserSystem/User.php b/src/Entity/UserSystem/User.php index a725e9da..d009d16e 100644 --- a/src/Entity/UserSystem/User.php +++ b/src/Entity/UserSystem/User.php @@ -68,10 +68,6 @@ class User extends AttachmentContainingDBElement implements UserInterface, HasPe */ public const ID_ANONYMOUS = 1; - public const AVAILABLE_THEMES = ['bootstrap', 'cerulean', 'cosmo', 'cyborg', 'darkly', 'flatly', 'journal', - 'litera', 'lumen', 'lux', 'materia', 'minty', 'morph', 'pulse', 'quartz', 'sandstone', 'simplex', 'sketchy', 'slate', 'solar', - 'spacelab', 'superhero', 'united', 'vapor', 'yeti', 'zephyr']; - /** * @var bool Determines if the user is disabled (user can not log in) * @ORM\Column(type="boolean") diff --git a/src/Form/Type/ThemeChoiceType.php b/src/Form/Type/ThemeChoiceType.php new file mode 100644 index 00000000..82b2fe8a --- /dev/null +++ b/src/Form/Type/ThemeChoiceType.php @@ -0,0 +1,58 @@ +. + */ + +namespace App\Form\Type; + +use App\Entity\UserSystem\User; +use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\ChoiceType; +use Symfony\Component\OptionsResolver\OptionsResolver; + +class ThemeChoiceType extends AbstractType +{ + private array $available_themes; + + public function __construct(array $available_themes) + { + $this->available_themes = $available_themes; + } + + public function getParent() + { + return ChoiceType::class; + } + + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults([ + 'choices' => $this->available_themes, + 'choice_label' => static function ($entity, $key, $value) { + return $value; + }, + 'attr' => [ + 'data-controller' => 'elements--selectpicker', + 'title' => 'selectpicker.nothing_selected', + ], + 'choice_translation_domain' => false, + 'placeholder' => 'user_settings.theme.placeholder' + ]); + } + +} \ No newline at end of file diff --git a/src/Form/UserAdminForm.php b/src/Form/UserAdminForm.php index a84fc2b4..8ec75247 100644 --- a/src/Form/UserAdminForm.php +++ b/src/Form/UserAdminForm.php @@ -30,6 +30,7 @@ use App\Form\Permissions\PermissionsType; use App\Form\Type\CurrencyEntityType; use App\Form\Type\MasterPictureAttachmentType; use App\Form\Type\StructuralEntityType; +use App\Form\Type\ThemeChoiceType; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; @@ -151,18 +152,8 @@ class UserAdminForm extends AbstractType 'preferred_choices' => ['Europe/Berlin'], 'disabled' => !$this->security->isGranted('change_user_settings', $entity), ]) - ->add('theme', ChoiceType::class, [ + ->add('theme', ThemeChoiceType::class, [ 'required' => false, - 'choices' => User::AVAILABLE_THEMES, - 'choice_label' => static function ($entity, $key, $value) { - return $value; - }, - 'attr' => [ - 'data-controller' => 'elements--selectpicker', - 'title' => 'selectpicker.nothing_selected', - ], - 'choice_translation_domain' => false, - 'placeholder' => 'user_settings.theme.placeholder', 'label' => 'user.theme.label', 'disabled' => !$this->security->isGranted('change_user_settings', $entity), ]) diff --git a/src/Form/UserSettingsType.php b/src/Form/UserSettingsType.php index 890fbe67..89680a6c 100644 --- a/src/Form/UserSettingsType.php +++ b/src/Form/UserSettingsType.php @@ -24,6 +24,7 @@ namespace App\Form; use App\Entity\UserSystem\User; use App\Form\Type\CurrencyEntityType; +use App\Form\Type\ThemeChoiceType; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Event\PreSetDataEvent; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; @@ -114,18 +115,9 @@ class UserSettingsType extends AbstractType 'label' => 'user.timezone.label', 'preferred_choices' => ['Europe/Berlin'], ]) - ->add('theme', ChoiceType::class, [ + ->add('theme', ThemeChoiceType::class, [ 'disabled' => $this->demo_mode, 'required' => false, - 'attr' => [ - 'data-controller' => 'elements--selectpicker', - ], - 'choice_translation_domain' => false, - 'choices' => User::AVAILABLE_THEMES, - 'choice_label' => static function ($entity, $key, $value) { - return $value; - }, - 'placeholder' => 'user_settings.theme.placeholder', 'label' => 'user.theme.label', ]) ->add('currency', CurrencyEntityType::class, [ diff --git a/templates/base.html.twig b/templates/base.html.twig index 8cf2f507..8c432bb7 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -41,7 +41,7 @@ - {% if theme and theme in constant('App\\Entity\\UserSystem\\User::AVAILABLE_THEMES') and encore_entry_exists('theme_' ~ theme) %} + {% if theme and theme in available_themes and encore_entry_exists('theme_' ~ theme) %} {{ encore_entry_link_tags('theme_' ~ theme) }} {% else %} {{ encore_entry_link_tags('theme_bootstrap') }}