wait #5741 @0.5

diff --git a/app/Fluidbook/Links.php b/app/Fluidbook/Links.php
index 4b6a8725492c4924de7b6e9201096d1419aca06c..44c16e8618a9e0be48442d7b6c389b0af3dc4cab 100644 (file)
--- a/app/Fluidbook/Links.php
+++ b/app/Fluidbook/Links.php
@@ -4,9 +4,6 @@ namespace App\Fluidbook;
 
 use App\Models\FluidbookPublication;
 use App\Models\User;
-use App\Util\wsDAOBook;
-use App\Util\wsDocument;
-use Cubist\Util\ArrayUtil;
 use Cubist\Util\Files\Files;
 use Cubist\Util\Gzip;
 use Cubist\Util\Str;
@@ -16,14 +13,13 @@ use PhpOffice\PhpSpreadsheet\Exception;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Style\Alignment;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
-use function App\Util\utf8_encode;
 
 class Links
 {
     protected static $_testLinkCache = null;
     protected static $_linksKey = null;
 
-    protected static $_webvideoServicesMap = [0 => 'youtube', 1 => 'dailymotion', 2 => 'vimeo', 3 => 'brightcove'];
+    protected static $_webvideoServicesMap = [0 => 'youtube', 1 => 'dailymotion', 2 => 'vimeo', 3 => 'brightcove', 'none' => 'youtube'];
 
     /**
      * @throws Exception
@@ -41,6 +37,7 @@ class Links
             'video_loop' => __('Video : boucle'), 'video_auto_start' => __('Video : démarrage automatique'), 'video_controls' => __('Vidéo : afficher les contrôles'), 'video_sound_on' => __('Vidéo : activer le son'),
             'inline' => __('Vidéo : afficher dans la page'), 'video_width' => __('Vidéo : Largeur du popup'), 'video_height' => __('Vidéo : Hauteur du popup'),
             'interactive' => __('Interactivité'), 'video_service' => __('Webvideo : service'),
+            'close_button'=>__('Bouton de fermeture'),
             'extra' => __('Paramètre supplémentaire'),
             'alternative' => __('Alternative'),
             'read_mode' => __('Mode de lecture'),

diff --git a/app/SubForms/Link/ShowLink.php b/app/SubForms/Link/ShowLink.php
index c0ce785427bbd0023cd781354bbaa3e38f419f7e..34b57c84175f35e53f8a7ca9ae241043ecdd26f1 100644 (file)
--- a/app/SubForms/Link/ShowLink.php
+++ b/app/SubForms/Link/ShowLink.php
@@ -14,6 +14,6 @@ class ShowLink extends Base
     {
         $this->addField('to', Text::class, __('Identifiant du lien à afficher'));
         $this->addField('target', ShowLinkMode::class, __('Mode'));
-        $this->addField('video_service', ShowLinkCloseMode::class, __('Placer un bouton de fermeture'));
+        $this->addField('close_button', ShowLinkCloseMode::class, __('Placer un bouton de fermeture'));
     }
 }