wip #4792 @0.25

diff --git a/app/Jobs/ProcessFluidbook.php b/app/Jobs/ProcessFluidbook.php
index cd47074c887bb7768e4ed1fe16414cdf894a63df..bbe5e81eeaeeb6fa4d071c9635b1c7321e6164e9 100644 (file)
--- a/app/Jobs/ProcessFluidbook.php
+++ b/app/Jobs/ProcessFluidbook.php
@@ -92,6 +92,21 @@ class ProcessFluidbook extends Compiler
                     $link['loop'] = false;
                     $link['sound'] = true;
                 }
+            } else if (stripos($e[0], 'audio/') === 0) {
+                $link['type'] = 17;
+                $link['inline'] = $e[0] === 'audio/inline';
+                $link['to'] = $this->_getAssetFile($e[1]);
+                if ($link['inline']) {
+                    $link['video_auto_start'] = false;
+                    $link['video_controls'] = true;
+                    $link['loop'] = false;
+                    $link['sound'] = true;
+                } else {
+                    $link['video_auto_start'] = true;
+                    $link['video_controls'] = true;
+                    $link['loop'] = false;
+                    $link['sound'] = true;
+                }
             }
             $res[$k] = $link;
         }

diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index 2558c9125de8341f5a7e05242341a62eb77bb8c8..ea529a021410760652713742552d2960301db1ac 100644 (file)
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -30,8 +30,9 @@ class Asset extends CubistMagicAbstractModel
                 'options' =>
                     [
                         'image' => 'Image',
-                        'inlinevideo' => 'Vidéo (intégrée à la page)',
-                        'popupvideo' => 'Vidéo (popup)',
+                        'slideshow' => 'Diaporama',
+                        'video' => 'Vidéo',
+                        'audio' => 'Audio',
                         'pdf' => 'Document PDF',
                         'download' => 'Fichier à télécharger'
                     ],