From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Tue, 27 Jun 2023 04:42:25 +0000 (+0200)
Subject: wait #6074 @0.25
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=69f9de4bc3f38a04367a9112dba762ba4a4190f8;p=fluidbook-toolbox.git

wait #6074 @0.25
---

diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php
index 8f8b6b638..2d0f2104a 100644
--- a/app/Models/FluidbookPublication.php
+++ b/app/Models/FluidbookPublication.php
@@ -181,7 +181,7 @@ class FluidbookPublication extends ToolboxSettingsModel
         $this->addField('composition_fluidbook_id', FluidbookV3ID::class, __('Utiliser la composition d\'un autre fluidbook'), ['excluded_options' => $this->id, 'when' => ['composition_fluidbook' => 1]]);
         $this->addField('composition_fluidbook_links', Checkbox::class, __('Utiliser également les liens de ce fluidbook'), ['default' => true, 'when' => ['composition_fluidbook' => 1]]);
         $this->addField('page_numbers', Hidden::class, __('Numérotation'));
-        $this->addField('composition', FluidbookComposition::class, __('Composition'), ['when' => ['composition_fluidbook' => 0]]);
+        $this->addField('composition', FluidbookComposition::class, __('Composition'), ['non_default_tracking' => false, 'when' => ['composition_fluidbook' => 0]]);
 
         $this->addField('section_theme', FormBigSection::class, __('Thème graphique'));
         $this->addField('theme', \App\Fields\FluidbookTheme::class, __('Thème'), ['non_default_tracking' => false, 'default' => 1161]);
diff --git a/app/Models/Traits/PublicationSettings.php b/app/Models/Traits/PublicationSettings.php
index ecb5be384..a3cccac2c 100644
--- a/app/Models/Traits/PublicationSettings.php
+++ b/app/Models/Traits/PublicationSettings.php
@@ -1960,6 +1960,7 @@ trait PublicationSettings
         ]);
         $this->addSettingField('scorm_version', SCORMVersion::class, $this->__('Version du standard SCORM'), [
             'v2' => '{"type":"combo","default":"1.2","editable":true,"label":"\\u00a7!\\u00a7Version du standard SCORM!\\u00a7!","grade":5,"datas":{"\\u00a7!\\u00a7SCORM 1.2!\\u00a7!":"1.2","\\u00a7!\\u00a7SCORM 2004 3rd edition!\\u00a7!":"2004.3","\\u00a7!\\u00a7SCORM 2004 4th edition!\\u00a7!":"2004"}}',
+            'default' => '1.2',
         ]);
         $this->addSettingField('scorm_id', LongText::class, $this->__('Identifiant SCORM'), [
             'v2' => '{"type":"text","default":"","editable":true,"label":"\\u00a7!\\u00a7Identifiant SCORM!\\u00a7!","grade":5}',
diff --git a/resources/views/fields/fluidbook_composition.blade.php b/resources/views/fields/fluidbook_composition.blade.php
index 41086ba13..081e70a12 100644
--- a/resources/views/fields/fluidbook_composition.blade.php
+++ b/resources/views/fields/fluidbook_composition.blade.php
@@ -677,7 +677,7 @@
               crossorigin="anonymous" referrerpolicy="no-referrer"/>
         <style>
             #composition {
-                padding: 0 5px;
+                margin: 15px -10px 0 -10px;
             }
 
             #composition_pages .page {