From: vincent@cubedesigners.com Date: Fri, 23 Nov 2018 15:10:53 +0000 (+0000) Subject: #2365 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=68d0bdf1633e5b976ec83f7667f9fae140696321;p=cubeextranet.git #2365 --- diff --git a/fluidbook/tools/fwstk/.idea/workspace.xml b/fluidbook/tools/fwstk/.idea/workspace.xml index c55095f13..551ac4434 100644 --- a/fluidbook/tools/fwstk/.idea/workspace.xml +++ b/fluidbook/tools/fwstk/.idea/workspace.xml @@ -6,42 +6,8 @@ - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - @@ -60,7 +26,7 @@ - + @@ -87,7 +53,7 @@ - + @@ -95,7 +61,7 @@ - + @@ -418,7 +384,7 @@ - + @@ -789,7 +755,7 @@ - + 1487172253077 @@ -847,11 +813,18 @@ - - @@ -917,6 +890,8 @@ + diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php index 1f9563f9c..c223466af 100644 --- a/inc/ws/Metier/class.ws.book.parametres.php +++ b/inc/ws/Metier/class.ws.book.parametres.php @@ -95,8 +95,14 @@ class wsBookParametres extends wsParametres $this->fields['title'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __("Titre de la publication"), 'embed' => false); $this->fields['url_link'] = array('type' => 'text', 'default' => 'http://', 'editable' => true, 'label' => __("URL du lien de retour au site")); $this->fields['signature'] = array('type' => 'combo', 'default' => '1', 'editable' => true, 'label' => __('Signature'), 'grade' => 3, 'datas' => wsDroits::getSignatures()); + $this->fields['mobileTransitions'] = array('type' => 'combo', 'default' => 'flip', 'editable' => true, 'label' => __('Transitions entre les pages'), 'grade' => 3, + 'datas' => array(__('Aucune transition') => 'none', + __('Glisser') => 'slide', + __('Tourner (rigide)') => 'flip', + __('Tourner (souple, expérimental)') => 'flip3d') + ); $this->forms['important'] = array('label' => __('Description de la publication'), - 'fieldsnames' => array('version', 'mobileLVersion', 'mobileVersion', 'title', 'url_link', 'signature')); + 'fieldsnames' => array('version', 'mobileLVersion', 'mobileVersion', 'mobileTransitions', 'title', 'url_link', 'signature')); // . // . @@ -452,11 +458,6 @@ class wsBookParametres extends wsParametres $this->fields['menuBreakpoint'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Breakpoint burger menu'), 'hint' => 'Par défaut 1023px', 'grade' => 3); - $this->fields['mobileTransitions'] = array('type' => 'combo', 'default' => 'flip', 'editable' => true, 'label' => __('Transitions entre les pages'), 'grade' => 3, - 'datas' => array(__('Aucune transition') => 'none', - __('Glisser') => 'slide', - __('Tourner') => 'flip') - ); $this->fields['mobileNavigationType'] = array('type' => 'combo', 'default' => 'book', 'editable' => true, 'label' => __('Mode de navigation'), 'grade' => 5, 'datas' => array(__('Normal (automatique)') => 'book', __('Normal (double page)') => 'landscape', @@ -482,7 +483,7 @@ class wsBookParametres extends wsParametres $this->fields['mobileIgnoreBackgroundLinks'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Ignorer les liens de background')); $this->forms['mobile'] = array('label' => __('Version mobile'), - 'fieldsnames' => array('alwaysHTML5', 'html5priority', 'flashBlockedWait', 'mobileNavigationType', '|', 'rasterizePages', 'vectorPages', '|', 'mobileNavScale', '|', 'mobileTransitions', 'mobileTransitionDuration', "mobileLinksRevealAnim", '|', 'menuBreakpoint', 'navOrderH', '|', 'mobileIconVector', 'mobileServerConfig', 'mobilePlugins', '|', 'mobileVideosPath', '|', 'mobileExtraXSpace', '|', 'mobileIgnoreBackgroundLinks')); + 'fieldsnames' => array('alwaysHTML5', 'html5priority', 'flashBlockedWait', 'mobileNavigationType', '|', 'rasterizePages', 'vectorPages', '|', 'mobileNavScale', '|', 'mobileTransitionDuration', "mobileLinksRevealAnim", '|', 'menuBreakpoint', 'navOrderH', '|', 'mobileIconVector', 'mobileServerConfig', 'mobilePlugins', '|', 'mobileVideosPath', '|', 'mobileExtraXSpace', '|', 'mobileIgnoreBackgroundLinks')); $this->fields['phonegapId'] = array('type' => 'text', 'default' => 'com.fluidbook.phonegap.$id', 'editable' => true, 'label' => __("Identifiant de l'identifiant"), 'grade' => 5, 'hint' => __('De la forme') . ' com.fluidbook.phonegap.xxxxx'); diff --git a/inc/ws/Util/html5/3dflip/class.ws.html5.compiler.php b/inc/ws/Util/html5/3dflip/class.ws.html5.compiler.php index 056e5d3ba..d68f66bec 100644 --- a/inc/ws/Util/html5/3dflip/class.ws.html5.compiler.php +++ b/inc/ws/Util/html5/3dflip/class.ws.html5.compiler.php @@ -6,6 +6,7 @@ class wsHTML5Compiler public $maxRes = 300; public $jsFiles = array( + 'js/libs/cube/util.js', 'js/libs/modernizr/modernizr.min.js', 'js/libs/modernizr/tests.js', 'js/libs/threejs/three.min.js', @@ -1295,6 +1296,7 @@ class wsHTML5Compiler } $this->vdir->copyDirectory($this->assets . '/js/libs/fluidbook/workers', 'js/libs/fluidbook/workers'); $this->vdir->copyDirectory($this->assets . '/js/libs/stand', 'js/libs/stand'); + $this->vdir->copyDirectory($this->assets . '/js/libs/polyfills', 'js/libs/polyfills'); } public function writeTexts() @@ -1393,10 +1395,17 @@ class wsHTML5Compiler break; } + $rasterizePages = $this->config->rasterizePages; + $thumbs = array(); foreach ($this->pages as $page => $infos) { $docdir = wsDocument::getDir($infos['document_id']); - if ($this->svg) { + + $thisrasterize = in_array($page, $rasterizePages); + $thisimagesvg = !$thisrasterize && $this->svg; + $thisbackgroundPrefix = $thisrasterize ? ['t'] : $this->backgroundsPrefix; + + if ($thisimagesvg) { $full = $docdir . 'html/fp' . $infos['document_page'] . '.svg'; $fullopt = $docdir . 'html/fo' . $infos['document_page'] . '%s.svg'; $orig = $docdir . 'html/tp' . $infos['document_page'] . '.svg'; @@ -1421,7 +1430,7 @@ class wsHTML5Compiler } foreach ($this->getResolutions() as $r) { - foreach ($this->backgroundsPrefix as $backgroundsPrefix) { + foreach ($thisbackgroundPrefix as $backgroundsPrefix) { $srcPrefix = $backgroundsPrefix; if ($backgroundsPrefix == 'p') { $srcPrefix = 'h'; @@ -1759,6 +1768,7 @@ class wsHTML5Compiler $destination_css = $tmp . '/' . $f . '.css'; if (!file_exists($source_less)) { + die($source_less); continue; } 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 e2fdf1c6b..141178315 100644 --- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php +++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php @@ -3,11 +3,17 @@ class wsHTML5Compiler { public static $resolutions = array(150, 300); + public $maxRes = 300; public $jsFiles = array( + 'js/libs/cube/util.js', 'js/libs/modernizr/modernizr.min.js', 'js/libs/modernizr/tests.js', - 'js/libs/cookie.min.js', + 'js/libs/threejs/three.min.js', + 'js/libs/threejs/Projector.js', + 'js/libs/threejs/CanvasRenderer.js', + 'js/libs/threejs/modifier.js', + 'js/libs/threejs/stats.js', 'js/libs/cube/fb.js', 'js/libs/cube/util.js', 'js/libs/screenfull.min.js', @@ -24,6 +30,7 @@ class wsHTML5Compiler 'js/libs/mmenu/jquery.mmenu.offcanvas.min.js', 'js/libs/gsap/TweenMax.min.js', 'js/libs/gsap/jquery.gsap.min.js', + 'js/libs/threejs/Tweenmax.threejs.js', 'js/libs/gal/gal.js', 'js/libs/gal/gal.filesystem.js', 'js/libs/hammer.min.js', @@ -37,6 +44,7 @@ class wsHTML5Compiler 'js/libs/fluidbook/fluidbook.share.js', 'js/libs/fluidbook/fluidbook.l10n.js', 'js/libs/fluidbook/fluidbook.slider.js', + 'js/libs/fluidbook/fluidbook.pagetransitions.js', 'js/libs/fluidbook/fluidbook.nav.js', 'js/libs/fluidbook/fluidbook.interface.js', 'js/libs/fluidbook/fluidbook.touch.js', @@ -57,6 +65,7 @@ class wsHTML5Compiler 'js/libs/fluidbook/fluidbook.sound.js', 'js/libs/fluidbook/fluidbook.contentlock.js', 'js/libs/fluidbook/fluidbook.scorm.js', + 'js/libs/fluidbook/fluidbook.3dflip.js', 'js/libs/fluidbook/menu/fluidbook.chapters.js', 'js/libs/fluidbook/menu/fluidbook.index.js', 'js/libs/fluidbook/fluidbook.landingpage.js', @@ -195,6 +204,7 @@ class wsHTML5Compiler $this->phonegap = $phonegap; $this->standalone = $standalone || $this->phonegap; $this->appcache = $appcache; + $this->widget = !$this->phonegap; cubePHP::set_memory('4G'); @@ -1283,7 +1293,9 @@ class wsHTML5Compiler if ($this->phonegap) { $this->vdir->copy(WS_COMPILE_ASSETS . '/_html5/js/libs/phonegap/' . $this->phonegapVersion . '/cordova-' . $this->phonegap . '.js', 'data/cordova.js'); } - + $this->vdir->copyDirectory($this->assets . '/js/libs/fluidbook/workers', 'js/libs/fluidbook/workers'); + $this->vdir->copyDirectory($this->assets . '/js/libs/stand', 'js/libs/stand'); + $this->vdir->copyDirectory($this->assets . '/js/libs/polyfills', 'js/libs/polyfills'); } public function writeTexts()