From fa4b762d0058721e1295ed7132cd6f3e2aa63608 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tempez?= Date: Wed, 9 Feb 2022 15:21:44 +0100 Subject: [PATCH] =?UTF-8?q?Fontes=20utilis=C3=A9es=20okay=20pour=20tests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/module/theme/theme.php | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php index b9587f1c..ef519def 100644 --- a/core/module/theme/theme.php +++ b/core/module/theme/theme.php @@ -553,26 +553,25 @@ class theme extends common { // Polices liées au thème $used = [ - $this->getData (['theme', 'header', 'font']) => 'Bannière', - $this->getData (['theme', 'menu', 'font']) => 'Menu', - $this->getData (['theme', 'title', 'font']) => 'Titre', - $this->getData (['theme', 'text', 'font']) => 'Texte', - $this->getData (['theme', 'footer', 'font']) => 'Pied de page', - $this->getData (['admin', 'fontTitle' ]) => 'Titre (admin)', - $this->getData (['admin', 'fontText' ]) => 'Admin (texte)' + 'Bannière' => $this->getData (['theme', 'header', 'font']), + 'Menu' => $this->getData (['theme', 'menu', 'font']), + 'Titre ' => $this->getData (['theme', 'title', 'font']), + 'Texte' => $this->getData (['theme', 'text', 'font']), + 'Pied de page' => $this->getData (['theme', 'footer', 'font']), + 'Titre (admin)' => $this->getData (['admin', 'fontTitle' ]), + 'Admin (texte)' => $this->getData (['admin', 'fontText' ]) ]; - $fontUsed = []; - foreach (self::$fonts as $fontId => $fontName) { - foreach ($used as $key => $value) { - if ( $key === $fontId) { - $fontUsed[$fontId] = $value . ' '; - } else { - $fontUsed[$fontId] = ''; - } - } - } + // Parcourir les fontes installées et construire le tableau pour le formulaire foreach (self::$fonts as $fontId => $fontName) { + + // Fontes utilisées par le thème + $fontUsed[$fontId] = ''; + foreach ($used as $key => $value) { + if ( $value === $fontId) { + $fontUsed[$fontId] .= $key . '
'; + } + } self::$fontsList [] = [ $fontName, $fontId,