wip #5731

diff --git a/app/Fluidbook/Link/Custom/InpesPopinLink.php b/app/Fluidbook/Link/Custom/InpesPopinLink.php
index 902709189bcc57be829e41f537ca95ee60082079..b0580c9fcc0e5d552c1d152698eb7883e211b48a 100644 (file)
--- a/app/Fluidbook/Link/Custom/InpesPopinLink.php
+++ b/app/Fluidbook/Link/Custom/InpesPopinLink.php
@@ -24,7 +24,7 @@ class InpesPopinLink extends HTMLMultimediaLink
         return '<a href="#" ' . $tooltip . $c . $this->getAdditionnalContent() . '></a>';
     }
 
-    public function getCSSContainer()
+    protected function _getCSSContainer()
     {
         if ($this->moveOnEvenPage()) {
             $this->page--;

diff --git a/app/Jobs/FluidbookCompiler.php b/app/Jobs/FluidbookCompiler.php
index 128c8068782739ea37b9bbca41731dac62c9906d..3b85117056d469ad03e16dd206effa248e98063b 100644 (file)
--- a/app/Jobs/FluidbookCompiler.php
+++ b/app/Jobs/FluidbookCompiler.php
@@ -337,6 +337,7 @@ class FluidbookCompiler extends Base implements CompilerInterface
         $this->pdf2htmlRatio = round(($imagesize[0] * 0.48) / $this->width, 12);
 
         $this->linkScale = $this->cssScale = $this->z * min($this->optimalWidth / $this->width, $this->optimalHeight / $this->height);
+
         $this->cssOneScale = $this->z * min(($this->optimalWidth * 2) / $this->width, $this->optimalHeight / $this->height);
 
         $this->cssWidth = $this->width * $this->cssScale;

diff --git a/app/Models/Traits/PublicationSettings.php b/app/Models/Traits/PublicationSettings.php
index 8093c325e1c33da8c15696b0f1a529db0ca96ded..5ca65d0d6ef47e08f16fe994bca7d7308483e333 100644 (file)
--- a/app/Models/Traits/PublicationSettings.php
+++ b/app/Models/Traits/PublicationSettings.php
@@ -420,26 +420,26 @@ trait PublicationSettings
             'store_in' => 'settings',
             'translatable' => false,
         ]);
-        $this->addField('visualisationMode', SelectFromArray::class, $this->__('Mode de visualisation 3D'), [
-            'v2' => '{"type":"combo","default":"3","editable":false,"label":"\\u00a7!\\u00a7Mode de visualisation 3D!\\u00a7!","datas":{"\\u00a7!\\u00a7Mode 3D!\\u00a7!":"0","\\u00a7!\\u00a7Mode 2D (cam\\u00e9ra fixe et pages \\u00e0 plat)!\\u00a7!":"1","\\u00a7!\\u00a7Laisser le choix \\u00e0 l\'utilisateur (mode 3D par d\\u00e9faut)!\\u00a7!":"2","\\u00a7!\\u00a7Laisser le choix \\u00e0 l\'utilisateur (mode 2D par d\\u00e9faut)!\\u00a7!":"3"}}',
-            'options' => [
-                0 => $this->__('Mode 3D'),
-                1 => $this->__('Mode 2D (caméra fixe et pages à plat)'),
-                2 => $this->__('Laisser le choix à l\'utilisateur (mode 3D par défaut)'),
-                3 => $this->__('Laisser le choix à l\'utilisateur (mode 2D par défaut)'),
-            ],
-            'default' => '3',
-            'fake' => true,
-            'store_in' => 'settings',
-            'translatable' => false,
-        ]);
-        $this->addField('antialiasReading', Checkbox::class, $this->__('Amélioration de la lisibilité en mode 2D'), [
-            'v2' => '{"type":"boolean","default":true,"editable":false,"label":"\\u00a7!\\u00a7Am\\u00e9lioration de la lisibilit\\u00e9 en mode 2D!\\u00a7!"}',
-            'default' => true,
-            'fake' => true,
-            'store_in' => 'settings',
-            'translatable' => false,
-        ]);
+//        $this->addField('visualisationMode', SelectFromArray::class, $this->__('Mode de visualisation 3D'), [
+//            'v2' => '{"type":"combo","default":"3","editable":false,"label":"\\u00a7!\\u00a7Mode de visualisation 3D!\\u00a7!","datas":{"\\u00a7!\\u00a7Mode 3D!\\u00a7!":"0","\\u00a7!\\u00a7Mode 2D (cam\\u00e9ra fixe et pages \\u00e0 plat)!\\u00a7!":"1","\\u00a7!\\u00a7Laisser le choix \\u00e0 l\'utilisateur (mode 3D par d\\u00e9faut)!\\u00a7!":"2","\\u00a7!\\u00a7Laisser le choix \\u00e0 l\'utilisateur (mode 2D par d\\u00e9faut)!\\u00a7!":"3"}}',
+//            'options' => [
+//                0 => $this->__('Mode 3D'),
+//                1 => $this->__('Mode 2D (caméra fixe et pages à plat)'),
+//                2 => $this->__('Laisser le choix à l\'utilisateur (mode 3D par défaut)'),
+//                3 => $this->__('Laisser le choix à l\'utilisateur (mode 2D par défaut)'),
+//            ],
+//            'default' => '3',
+//            'fake' => true,
+//            'store_in' => 'settings',
+//            'translatable' => false,
+//        ]);
+//        $this->addField('antialiasReading', Checkbox::class, $this->__('Amélioration de la lisibilité en mode 2D'), [
+//            'v2' => '{"type":"boolean","default":true,"editable":false,"label":"\\u00a7!\\u00a7Am\\u00e9lioration de la lisibilit\\u00e9 en mode 2D!\\u00a7!"}',
+//            'default' => true,
+//            'fake' => true,
+//            'store_in' => 'settings',
+//            'translatable' => false,
+//        ]);
         $this->addField('correctCenter', Checkbox::class, $this->__('Corriger les lignes blanches entre les pages'), [
             'v2' => '{"type":"boolean","default":true,"editable":true,"label":"\\u00a7!\\u00a7Corriger les lignes blanches entre les pages!\\u00a7!","grade":2}',
             'default' => true,
@@ -447,15 +447,15 @@ trait PublicationSettings
             'store_in' => 'settings',
             'translatable' => false,
         ]);
-        $this->addField('pagesBaseAngle', Integer::class, $this->__('Angle de base entre les pages'), [
-            'v2' => '{"type":"integer","default":2,"editable":false,"label":"\\u00a7!\\u00a7Angle de base entre les pages!\\u00a7!","grade":3,"hint":"\\u00a7!\\u00a70 : Publication \\u00e0 plat!\\u00a7!\\n\\u00a7!\\u00a72 : Valeur par d\\u00e9faut!\\u00a7!"}',
-            'hint' => $this->__('0 : Publication à plat') . '
-' . $this->__('2 : Valeur par défaut'),
-            'default' => 2,
-            'fake' => true,
-            'store_in' => 'settings',
-            'translatable' => false,
-        ]);
+//        $this->addField('pagesBaseAngle', Integer::class, $this->__('Angle de base entre les pages'), [
+//            'v2' => '{"type":"integer","default":2,"editable":false,"label":"\\u00a7!\\u00a7Angle de base entre les pages!\\u00a7!","grade":3,"hint":"\\u00a7!\\u00a70 : Publication \\u00e0 plat!\\u00a7!\\n\\u00a7!\\u00a72 : Valeur par d\\u00e9faut!\\u00a7!"}',
+//            'hint' => $this->__('0 : Publication à plat') . '
+//' . $this->__('2 : Valeur par défaut'),
+//            'default' => 2,
+//            'fake' => true,
+//            'store_in' => 'settings',
+//            'translatable' => false,
+//        ]);
         $this->addField('centerBook', Checkbox::class, $this->__('Centrer la publication sur les couvertures'), [
             'v2' => '{"type":"boolean","default":true,"editable":true,"label":"\\u00a7!\\u00a7Centrer la publication sur les couvertures!\\u00a7!","grade":2}',
             'default' => true,