fix #3612 @1

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index 40ea976b627cae2b8e0bb18653c10348a94fae42..6735fe32156ff0730454c4e1d1b16e42e2bbea29 100644 (file)
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -622,9 +622,9 @@ class wsMaintenance
             }
         }
 
-        self::_moveDocs(WS_DOCS, '/data/extranet/www/fluidbook/docs1', 250);
-        self::_moveDocs('/data/extranet/www/fluidbook/docs1', '/data/extranet/www/fluidbook/docs2', 2000);
-        self::_moveDocs('/data/extranet/www/fluidbook/docs2', '/data/extranet/www/fluidbook/docs3', 25000);
+        self::_moveDocs(WS_DOCS, '/data/extranet/www/fluidbook/docs1', 150);
+        self::_moveDocs('/data/extranet/www/fluidbook/docs1', '/data/extranet/www/fluidbook/docs2', 500);
+        self::_moveDocs('/data/extranet/www/fluidbook/docs2', '/data/extranet/www/fluidbook/docs3', 100000);
     }
 
     protected static function _moveDocs($from, $to, $keep, $batch = 250)

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 2d0d26fc04a136c1196eece06da7ece9d19e5795..0e1eb0a49b0d7a83f01fac91f3135e72112ac3aa 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -451,6 +451,12 @@ class wsBookParametres extends wsParametres
             'fieldsnames' => ['audiodescriptionTexts', 'audiodescriptionVoice']
         ];
 
+        $this->fields['splashImage'] = ['type' => 'freefile', 'default' => '', 'editable' => true, 'label' => __('Image'), 'grade' => 3, 'fileFilter' => $imageFilter];
+        $this->fields['splashURL'] = ['type' => 'text', 'default' => '', 'editable' => true, 'label' => __('URL'), 'grade' => 3];
+        $this->fields['splashMinimalTime'] = ['type' => 'float', 'default' => '5', 'editable' => true, 'label' => __('Temps minimal d\'affichage'), 'grade' => 3];
+
+        $this->forms['splash'] = ['label' => __('Ecran de chargement'), 'fieldsnames' => ['splashImage', 'splashURL', 'splashMinimalTime']];
+
         //.
         $this->fields['externalArchives'] = array('type' => 'freefile', 'default' => '', 'editable' => true,
             'label' => __('Archives'), 'grade' => 3, 'fileFilter' => $imageFilter);

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 68fe80038daf88d693bcf78a5ee5d1fe98a29d02..d1c581dd8a69ac0d9b1fec960553033def74cfc3 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -92,6 +92,7 @@ class wsHTML5Compiler
                 'js/libs/fluidbook/fluidbook.print.js',
                 'js/libs/fluidbook/fluidbook.secure.js',
                 'js/libs/fluidbook/fluidbook.tabs.js',
+                'js/libs/fluidbook/fluidbook.widget.js',
                 'js/libs/fluidbook/fluidbook.js',
                 'js/main.js'],
         'mobilefirst' => [