From 32afde44f59c753c5a90874cfa7d241c7ba086c1 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 7 Jun 2023 16:22:14 +0200
Subject: [PATCH] wait #6004 @0.5

---
 app/Fluidbook/Compiler/Compiler.php | 2 +-
 app/Models/FluidbookTheme.php       | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/Fluidbook/Compiler/Compiler.php b/app/Fluidbook/Compiler/Compiler.php
index d5d88ebad..395aff9fa 100644
--- a/app/Fluidbook/Compiler/Compiler.php
+++ b/app/Fluidbook/Compiler/Compiler.php
@@ -267,7 +267,6 @@ class Compiler extends Base implements CompilerInterface
     protected $_command = null;
 
 
-
     use \App\Fluidbook\Compiler\Links;
     use Cart;
     use Stats;
@@ -2170,6 +2169,7 @@ class Compiler extends Base implements CompilerInterface
             $this->vdir->copy($l->getPathname(), 'data/images/' . $l->getFilename());
             $dim = Image::getimagesize($l->getPathname());
             $logo .= 'background-image:url(../images/' . $l->getFilename() . ');width:' . $dim[0] . 'px;height:' . $dim[1] . 'px;';
+            $this->config->logoDimensions = [$dim[0], $dim[1]];
         }
         $logo .= '}';
         $res[] = $logo;
diff --git a/app/Models/FluidbookTheme.php b/app/Models/FluidbookTheme.php
index 68438acab..772020f5f 100644
--- a/app/Models/FluidbookTheme.php
+++ b/app/Models/FluidbookTheme.php
@@ -11,6 +11,7 @@ use App\Models\Base\ToolboxSettingsModel;
 use Cubist\Backpack\Magic\EntityData;
 use Cubist\Backpack\Magic\Fields\Color;
 use Cubist\Backpack\Magic\Fields\Files;
+use Cubist\Backpack\Magic\Fields\SelectFromArray;
 use Cubist\Backpack\Magic\Fields\SelectFromModel;
 use Cubist\Util\CommandLine;
 use Cubist\Util\CommandLine\Imagemagick\Ico;
@@ -506,9 +507,11 @@ class FluidbookTheme extends ToolboxSettingsModel
 
         $this->addField([
             'name' => 'invertMenuPosition',
-            'type' => 'Checkbox',
-            'label' => __('Intervertir le menu et le logo'),
-            'default' => false,
+            'type' => SelectFromArray::class,
+            'label' => __('Disposition du menu et du logo'),
+            'options' => [0 => __('Logo à droite et menu à gauche'), 1 => __('Logo à gauche et menu à droite'), 2 => __('Logo au centre et menu à gauche'), 3 => __('Logo au centre et menu à droite')],
+            'hint' => __('Sur un fluidbook RTL (arabe ou hébreu par exemple), les positions sont automatiquement inversées'),
+            'default' => 0,
             'translatable' => false,
         ]);
         $this->addField([
-- 
2.39.5