wait #4129 @1.5

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index f480a8d00ffb7ce84c582bbd6bcaa0bcf5196346..083b68c08278d47fbb7f822aa9b5ecff189ce1dd 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -526,6 +526,10 @@ class wsBookParametres extends wsParametres
         $this->forms['videos'] = array('label' => __('Vidéos'),
             'fieldsnames' => array('mobileVideosPath', '|', 'brightcovePlayerId', 'brightcovePlayerSecret'));
         //.
+        $this->fields['audioPlayerTheme'] = ['type' => 'combo', 'default' => 'native', 'editable' => true, 'label' => __('Apparence du lecteur audio'), 'datas' => [__('Apparence native du navigateur') => 'native', __('Zone cliquable invisible') => 'invisible', __('Red Bull') => 'redbull']];
+        $this->forms['audio'] = ['label' => __('Lecteur audio'),
+            'fieldsnames' => ['audioPlayerTheme']];
+        //.
         $this->fields['downloadPortionPDF'] = ['type' => 'freefile', 'default' => '', 'editable' => true, 'label' => 'PDF utilisé pour le téléchargement des extraits'];
         $this->fields['downloadPortionZoom'] = ['type' => 'integer', 'default' => 8, 'editable' => false, 'editable' => true, 'label' => __('Zoom des images extraites')];
         $this->forms['downloadportion'] = array('label' => __('Téléchargement d\'extraits'),

diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
index 6389d6f205633b36317254255662595aef2f3c17..160b6b7721734b6017714b09ec8d0e9f8937d6fe 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -83,6 +83,7 @@ class wsHTML5Compiler
                 'js/libs/fluidbook/fluidbook.background.js',
                 'js/libs/fluidbook/fluidbook.pad.js',
                 'js/libs/fluidbook/fluidbook.audiodescription.js',
+                'js/libs/fluidbook/fluidbook.audioplayer.js',
                 'js/libs/fluidbook/fluidbook.accessibility.js',
                 'js/libs/fluidbook/fluidbook.privacy.js',
                 'js/libs/fluidbook/fluidbook.zoom.js',

diff --git a/inc/ws/Util/html5/master/class.ws.html5.links.php b/inc/ws/Util/html5/master/class.ws.html5.links.php
index f892a18102339a21268c4ca618d3571ad5c02e0e..200eaf3be2153e7e9568851ee0035ea24d0dac6d 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.links.php
@@ -1443,6 +1443,7 @@ class remarkableCartLink extends cartLink
 class layerLink extends imageLink
 {
     protected $maxzoom_default = 4;
+    public $defaultZIndex = 31;
 
     public function getCSS()
     {
@@ -1897,7 +1898,13 @@ class audioLink extends wsHTML5Link
 
     public static function makeAudioTag($linkDatas, $w = null, $h = null, $compiler = null)
     {
-        $res = '<audio controls ';
+        $theme = $compiler->book->parametres->audioPlayerTheme;
+        $controls = '';
+        if ($theme === 'native') {
+            $controls = 'controls ';
+        }
+
+        $res = '<audio class="' . $theme . '" ' . $controls;
         if ($linkDatas->video_loop) {
             $res .= 'loop ';
         }
@@ -1906,6 +1913,7 @@ class audioLink extends wsHTML5Link
         }
         $res .= ' src="' . wsHTML5Link::getUniversalLocation($linkDatas->to) . '"';
         $res .= '></audio>';
+        $res .= '<div class="visualPlayer"></div>';
         return $res;
     }