From 8b15ebe18805858eb10173f3c676eef982ba8bce Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Thu, 16 Feb 2023 18:11:19 +0100 Subject: [PATCH] wait #5741 @0.5 --- app/Fluidbook/Links.php | 7 ++----- app/SubForms/Link/ShowLink.php | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/Fluidbook/Links.php b/app/Fluidbook/Links.php index 4b6a87254..44c16e861 100644 --- 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 c0ce78542..34b57c841 100644 --- 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')); } } -- 2.39.5