wait #7291 @1

diff --git a/app/Fields/FluidbookLinkEditor/WebvideoIntegration.php b/app/Fields/FluidbookLinkEditor/WebvideoIntegration.php
new file mode 100644 (file)
index 0000000..7e4110b
--- /dev/null
+++ b/app/Fields/FluidbookLinkEditor/WebvideoIntegration.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Fields\FluidbookLinkEditor;
+
+
+class WebvideoIntegration extends MultimediaIntegration
+{
+    public function getOptions()
+    {
+        return array_merge(parent::getOptions(), ['_blank' => __('Ouvrir dans un nouvel onglet')]);
+    }
+}

diff --git a/app/SubForms/Link/Audio.php b/app/SubForms/Link/Audio.php
index ce5054619b92e67f67f77d3be4a566a14a902295..4715955f98efead6eb2a02ba97a86d78b63b6a42 100644 (file)
--- a/app/SubForms/Link/Audio.php
+++ b/app/SubForms/Link/Audio.php
@@ -11,7 +11,7 @@ use Cubist\Backpack\Magic\Fields\SelectFromArray;
 class Audio extends Base
 {
     public $type = Link::AUDIO;
-    public $_integration = true;
+    public $_integration = 'multimedia';
     public $_multimedia = true;
 
     public function addDestinationField()

diff --git a/app/SubForms/Link/Base.php b/app/SubForms/Link/Base.php
index 6faae1297f00b46641046bf1039438c488635028..ea3e1ac0013159d9ece9a849937c70969a15a19a 100644 (file)
--- a/app/SubForms/Link/Base.php
+++ b/app/SubForms/Link/Base.php
@@ -6,6 +6,7 @@ use App\Fields\FluidbookLinkEditor\Depth;
 use App\Fields\FluidbookLinkEditor\LinkType;
 use App\Fields\FluidbookLinkEditor\MultimediaIntegration;
 use App\Fields\FluidbookLinkEditor\RolloverAnimation;
+use App\Fields\FluidbookLinkEditor\WebvideoIntegration;
 use App\Fluidbook\Compiler\Compiler;
 use App\Fluidbook\Link\Link;
 use App\Models\FluidbookPublication;
@@ -209,8 +210,10 @@ class Base extends Form
 
     public function addBasicSettingsFields()
     {
-        if ($this->_integration) {
+        if ($this->_integration==='multimedia') {
             $this->addField('inline', MultimediaIntegration::class, __('Intégration'));
+        }else if($this->_integration==='webvideo'){
+            $this->addField('inline', WebvideoIntegration::class, __('Intégration'));
         }
 
         if ($this->_addedContents) {

diff --git a/app/SubForms/Link/IFrame.php b/app/SubForms/Link/IFrame.php
index fccc4265fa7ac2fe475db6345e81958f8619ed7d..721115b02b20303f9ac20c781ae2c56bf49b61ca 100644 (file)
--- a/app/SubForms/Link/IFrame.php
+++ b/app/SubForms/Link/IFrame.php
@@ -9,7 +9,7 @@ class IFrame extends Web
 {
     public $type = Link::IFRAME;
 
-    protected $_integration = true;
+    protected $_integration = 'multimedia';
 
     public function addDestinationField()
     {

diff --git a/app/SubForms/Link/Lottie.php b/app/SubForms/Link/Lottie.php
index e8cfad2e536780eea768a2833b761b563d0dc80e..ce777997f7241bbb01551fb3859b4859267e535e 100644 (file)
--- a/app/SubForms/Link/Lottie.php
+++ b/app/SubForms/Link/Lottie.php
@@ -10,7 +10,7 @@ use Cubist\Backpack\Magic\Fields\SelectFromArray;
 class Lottie extends Base
 {
     public $type = Link::LOTTIE;
-    public $_integration = false;
+    public $_integration = 'multimedia';
     public $_multimedia = true;
 
     public function addDestinationField()

diff --git a/app/SubForms/Link/Multimedia.php b/app/SubForms/Link/Multimedia.php
index 8d6ca71c8e82b0ec79b8be075ac35b84254a8e20..5c7d59883765aa8ba51cc9e3a27dfd97b1316de9 100644 (file)
--- a/app/SubForms/Link/Multimedia.php
+++ b/app/SubForms/Link/Multimedia.php
@@ -9,7 +9,7 @@ use Cubist\Backpack\Magic\Fields\FilesOrURL;
 class Multimedia extends Base
 {
     public $type = Link::MULTIMEDIA;
-    public $_integration = true;
+    public $_integration = 'multimedia';
     public $_multimedia = true;
 
     protected $_canContainLinks = 'to';

diff --git a/app/SubForms/Link/Video.php b/app/SubForms/Link/Video.php
index 5de4ca721af0f642b1ace171ddff027b5ff46d2c..aa02c51bfbde03a283443451a92b5e2da2d0a837 100644 (file)
--- a/app/SubForms/Link/Video.php
+++ b/app/SubForms/Link/Video.php
@@ -9,7 +9,7 @@ use Cubist\Backpack\Magic\Fields\FilesOrURL;
 class Video extends Base
 {
     public $type = Link::VIDEO;
-    public $_integration = true;
+    public $_integration = 'multimedia';
     public $_multimedia = true;
 
     public function addDestinationField()

diff --git a/app/SubForms/Link/WebVideo.php b/app/SubForms/Link/WebVideo.php
index 713ff935024a7417beccf73194071bc52f2a6edc..0825335015fa27e74644e942a45c3606f3edea75 100644 (file)
--- a/app/SubForms/Link/WebVideo.php
+++ b/app/SubForms/Link/WebVideo.php
@@ -5,10 +5,12 @@ namespace App\SubForms\Link;
 use App\Fields\FluidbookLinkEditor\WebvideoService;
 use App\Fluidbook\Link\Link;
 use Cubist\Backpack\Magic\Fields\Text;
+
 // __('!! Editeur de liens')
 class WebVideo extends Video
 {
     public $type = Link::WEBVIDEO;
+    public $_integration = 'webvideo';
 
     public function addDestinationField()
     {

diff --git a/composer.lock b/composer.lock
index b362d70d0c48fb18dd5f2ce8ea969f38323d47fe..606d279370bee1e529bc3e5bae2cf275b73d6a4d 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -1827,13 +1827,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubedesigners_userdatabase.git",
-                "reference": "3bb261ff5bf08ca0a684b6f21f9b48078307d5ab"
+                "reference": "5ab6c091e75d22f725ca27fa1aac0aa13cfd46f7"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubedesigners/userdatabase/cubedesigners-userdatabase-dev-master-83f3c6.tar",
-                "reference": "3bb261ff5bf08ca0a684b6f21f9b48078307d5ab",
-                "shasum": "902f9ac393e0ce0f5b1954b17fbec41214e98410"
+                "url": "https://composer.cubedesigners.com/dist/cubedesigners/userdatabase/cubedesigners-userdatabase-dev-master-2f9699.tar",
+                "reference": "5ab6c091e75d22f725ca27fa1aac0aa13cfd46f7",
+                "shasum": "f2382cfc205b9f57f00f0bb7144a587ba8c77abb"
             },
             "require": {
                 "cubist/cms-back": "dev-master",
@@ -1866,7 +1866,7 @@
                 }
             ],
             "description": "Cubedesigners common users database",
-            "time": "2024-09-09T13:11:27+00:00"
+            "time": "2025-01-29T10:18:24+00:00"
         },
         {
             "name": "cubist/azuretranslate",
@@ -2473,13 +2473,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_util.git",
-                "reference": "5f4706783ba44970a5b2f334d6bdfcd31f02824f"
+                "reference": "dea6b83c501b6ec03a95273f5eef99c7c93de7b3"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-03e95e.tar",
-                "reference": "5f4706783ba44970a5b2f334d6bdfcd31f02824f",
-                "shasum": "533100affe97178945e508ea9146228fc408e2d1"
+                "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-f4f0bc.tar",
+                "reference": "dea6b83c501b6ec03a95273f5eef99c7c93de7b3",
+                "shasum": "3099a341d0695d556e8df840ee2d986c2278adfe"
             },
             "require": {
                 "cubist/net": "dev-master",
@@ -2513,7 +2513,7 @@
                 }
             ],
             "description": "Utilities class",
-            "time": "2024-12-23T17:48:16+00:00"
+            "time": "2025-01-30T15:54:41+00:00"
         },
         {
             "name": "cviebrock/eloquent-sluggable",