wip #3828 @1

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index eee54246b7263a3525cac6ea2ba9b4ce5e38f7cb..cec20abe7a473089a2edc94ea212570aeab1e3c5 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -452,7 +452,7 @@ class wsBookParametres extends wsParametres
             'label' => __('Références produits'), 'grade' => 3, 'fileFilter' => $basketFilter, 'hint' => __('Fichier contenant les références produits'), 'dir' => 'commerce');
         $this->fields['product_zoom_buttons_order'] = ['type' => 'combo', 'datas' => [__('De la droite vers la gauche') => 'right', __('De la gauche vers la droite') => 'left'], 'editable' => true, 'grade' => 3, 'default' => 'right', 'label' => __('Order des boutons')];
         $icons = [__('Aucune') => 'none', __('Partage') => 'nav-share', __('Ecran') => 'icon-site', __('Télécharger') => 'nav-download', 'PDF' => 'icon-pdf', 'Video' => 'icon-video', __('Lien') => 'icon-link', __('Code') => 'icon-code', __('QR code') => 'icon-qr', __('Article') => 'icon-article', __('Panier') => 'nav-basket', __('Panier 2') => 'nav-basket-1'];
-        $actions = [__('Ouvrir un lien') => 'link', __('Copier un contenu') => 'copy', __('Vidéo') => 'video', __('Ajouter au panier') => 'addtocart'];
+        $actions = [__('Ouvrir un lien') => 'link', __('Ouvrir en iframe') => 'iframe', __('Copier un contenu') => 'copy', __('Vidéo') => 'video', __('Ajouter au panier') => 'addtocart'];
         $f = [];
         for ($i = 1; $i <= 3; $i++) {
             $this->fields['product_zoom_label_' . $i] = ['type' => 'text', 'label' => __('Label du bouton') . ' ' . $i, 'default' => '', 'editable' => true, 'grade' => 3];

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 6d7bfdb415afc026dd3226a05e2e2ced5d25528c..9883daeaa28234d6eecc50553c923a7b2d7b4c3b 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -24,7 +24,7 @@ class wsHTML5Compiler
         'jquery' =>
             ['js/libs/jquery/jquery.min.js',
             ],
-        'jquery-extra' => ['js/libs/jquery/jquery.transform.js',
+        'jquery-extras' => ['js/libs/jquery/jquery.transform.js',
             'js/libs/jquery/jquery.form.min.js',
             'js/libs/jquery/jquery.mousewheel.min.js',
             'js/libs/jquery/jquery.hashchange.min.js'],
@@ -936,6 +936,8 @@ class wsHTML5Compiler
 
             $beginbody = implode("\n", array_unique($this->beginBody));
 
+            $jstime="?j=".TIME;
+
             $iscript = '';
             if (count($this->htmlmultimedia)) {
                 $iscript .= '<script type="text/javascript">' . "\n";
@@ -943,18 +945,18 @@ class wsHTML5Compiler
                 $iscript .= '</script>' . "\n";
             }
 
-            $script = '<script type="text/javascript" charset="utf-8" src="data/datas.js"></script>' . "\n";
+            $script = '<script type="text/javascript" charset="utf-8" src="data/datas.js'.$jstime.'"></script>' . "\n";
             foreach ($this->jsLibs as $jsLib => $files) {
-                $script .= "\t" . '<script type="text/javascript" charset="utf-8" src="data/' . $jsLib . '.js"></script>' . "\n";
+                $script .= "\t" . '<script type="text/javascript" charset="utf-8" src="data/' . $jsLib . '.js'.$jstime.'"></script>' . "\n";
             }
             if ($this->book->parametres->scorm_enable) {
-                $script .= "\t" . '<script type="text/javascript" charset="utf-8" src="data/scorm.js"></script>' . "\n";
+                $script .= "\t" . '<script type="text/javascript" charset="utf-8" src="data/scorm.js'.$jstime.'"></script>' . "\n";
             }
             if (count($this->specialJsFiles)) {
-                $script .= "\t" . '<script type="text/javascript" charset="utf-8" src="data/special.js"></script>' . "\n";
+                $script .= "\t" . '<script type="text/javascript" charset="utf-8" src="data/special.js'.$jstime.'"></script>' . "\n";
             }
             foreach ($this->pluginJs as $p) {
-                $script .= "\t" . '<script type="text/javascript" charset="utf-8" src="' . $p . '"></script>' . "\n";
+                $script .= "\t" . '<script type="text/javascript" charset="utf-8" src="' . $p . $jstime.'"></script>' . "\n";
             }
             $script .= $iscript;