diff --git a/lib/RoadizCoreBundle/src/Controller/CustomFormController.php b/lib/RoadizCoreBundle/src/Controller/CustomFormController.php index 9088bb0d..c201a49c 100644 --- a/lib/RoadizCoreBundle/src/Controller/CustomFormController.php +++ b/lib/RoadizCoreBundle/src/Controller/CustomFormController.php @@ -212,7 +212,6 @@ private function prepareAndHandleCustomFormAssignation( 'fields' => $customFormsEntity->getFields(), 'head' => [ 'siteTitle' => $this->settingsBag->get('site_name'), - 'mainColor' => $this->settingsBag->get('main_color'), ] ]; $helper = $this->customFormHelperFactory->createHelper($customFormsEntity); diff --git a/lib/RoadizCoreBundle/src/Mailer/EmailManager.php b/lib/RoadizCoreBundle/src/Mailer/EmailManager.php index 67e9daee..540a7d9e 100644 --- a/lib/RoadizCoreBundle/src/Mailer/EmailManager.php +++ b/lib/RoadizCoreBundle/src/Mailer/EmailManager.php @@ -113,17 +113,12 @@ public function renderPlainTextEmailBody(): string } /** - * Added mainColor and headerImageSrc assignation - * to display email header. + * Added headerImageSrc assignation to display email header. * * @return $this */ public function appendWebsiteIcon(): static { - if (empty($this->assignation['mainColor']) && null !== $this->settingsBag) { - $this->assignation['mainColor'] = $this->settingsBag->get('main_color'); - } - if (empty($this->assignation['headerImageSrc']) && null !== $this->settingsBag) { $adminImage = $this->settingsBag->getDocument('admin_image'); if ($adminImage instanceof DocumentInterface && null !== $this->documentUrlGenerator) { diff --git a/lib/RoadizCoreBundle/src/TwigExtension/RoadizExtension.php b/lib/RoadizCoreBundle/src/TwigExtension/RoadizExtension.php index c5d4d333..3946bd8f 100644 --- a/lib/RoadizCoreBundle/src/TwigExtension/RoadizExtension.php +++ b/lib/RoadizCoreBundle/src/TwigExtension/RoadizExtension.php @@ -41,6 +41,7 @@ public function getGlobals(): array 'nodeTypes' => $this->nodeTypesBag, ], 'chroot_resolver' => $this->chrootResolver, + 'main_color' => $this->settingsBag->get('main_color'), 'meta' => [ 'siteName' => $this->settingsBag->get('site_name'), 'siteCopyright' => $this->settingsBag->get('site_copyright'), diff --git a/lib/RoadizCoreBundle/templates/customForm/base_custom_form.html.twig b/lib/RoadizCoreBundle/templates/customForm/base_custom_form.html.twig index e1b14ada..2738d4ba 100644 --- a/lib/RoadizCoreBundle/templates/customForm/base_custom_form.html.twig +++ b/lib/RoadizCoreBundle/templates/customForm/base_custom_form.html.twig @@ -10,10 +10,10 @@ {% include '@RoadizRozier/admin/meta-icon.html.twig' %} {# CSS scripts inclusions / Using webpack #} {% include '@RoadizRozier/partials/css-inject.html.twig' %} - {% if head.mainColor %} + {% if main_color %}