From 5418a9240b8c0c1721ad700c8ce23cf3cc9b9c2a Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Thu, 27 Jul 2023 10:22:17 +0200 Subject: [PATCH] wip #6178 @0.5 --- app/Fields/FluidbookFont.php | 2 +- app/Models/QuizTheme.php | 10 ++++++++++ resources/quizv2/js/quiz.data.js | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/Fields/FluidbookFont.php b/app/Fields/FluidbookFont.php index a6482481e..eb3f6836f 100644 --- a/app/Fields/FluidbookFont.php +++ b/app/Fields/FluidbookFont.php @@ -21,7 +21,7 @@ class FluidbookFont extends SelectFromArray public static function getAvailableFonts() { return [ - 'OpenSans' => ['fluidbook_label' => 'Open Sans (' . __('défaut') . ')', 'font_family' => '"Open Sans"', 'font_kit' => 'OpenSans'], + 'OpenSans' => ['fluidbook_label' => 'Open Sans', 'font_family' => '"Open Sans"', 'font_kit' => 'OpenSans'], 'Montserrat' => ['fluidbook_label' => 'Montserrat', 'font_family' => 'Montserrat', 'font_kit' => 'Montserrat'], 'Metropolis' => ['fluidbook_label' => 'Metropolis', 'font_family' => 'Metropolis', 'font_kit' => 'Metropolis'], 'SourceSans' => ['fluidbook_label' => 'Source Sans', 'font_family' => '"Source Sans 3"', 'font_kit' => 'SourceSans'], diff --git a/app/Models/QuizTheme.php b/app/Models/QuizTheme.php index 8a7d803ae..de82b52f9 100644 --- a/app/Models/QuizTheme.php +++ b/app/Models/QuizTheme.php @@ -2,6 +2,7 @@ namespace App\Models; +use App\Fields\FluidbookFont; use App\Fields\FluidbookThemeImage; use App\Fields\HorizontalAlign; use App\Fields\ThemeBackgroundSize; @@ -12,6 +13,7 @@ use Cubist\Backpack\Magic\Fields\Color; use Cubist\Backpack\Magic\Fields\FormSection; use Cubist\Backpack\Magic\Fields\FormSectionDescription; use Cubist\Backpack\Magic\Fields\FormSeparator; +use Cubist\Backpack\Magic\Fields\SelectFromArray; use League\Glide\Manipulators\Background; class QuizTheme extends ToolboxModel @@ -44,6 +46,7 @@ class QuizTheme extends ToolboxModel public function setSettingsFields() { $this->_colors(); + $this->_font(); $this->_logo(); $this->_background(); $this->_intro(); @@ -52,6 +55,13 @@ class QuizTheme extends ToolboxModel $this->_outro(); } + protected function _font() + { + $this->addField('sectionTexts', FormSection::class, __('Textes')); + $this->addField('textColor', SelectFromArray::class, __('Couleur des textes'), ['default' => 'auto', 'options' => ['auto' => __('Automatique'), '#ffffff' => __('Blanc'), '#000000' => __('Noir')]]); + $this->addField('font', FluidbookFont::class, __('Police de caractères'), ['default' => 'SourceSans', 'databaseDefault' => 'SourceSans']); + } + protected function _colors() { $this->addField('sectionColors', FormSection::class, __('Couleurs principales')); diff --git a/resources/quizv2/js/quiz.data.js b/resources/quizv2/js/quiz.data.js index 89bf278e7..c0b92e18c 100644 --- a/resources/quizv2/js/quiz.data.js +++ b/resources/quizv2/js/quiz.data.js @@ -2,6 +2,7 @@ function QuizData(quiz) { this.quiz = quiz; // Data will be populated at compile time this.data = data; + console.log(this.data); } module.exports = QuizData; -- 2.39.5