From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 27 Apr 2016 10:37:58 +0000 (+0000)
Subject: #fluidbook-html5 : Allow enable link blinking @1
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=3f7a7e14caa24ffc47b3b9debad52dd1cfe11ad7;p=cubeextranet.git

#fluidbook-html5 : Allow enable link blinking @1
---

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 5b9ea1955..491b60ee8 100644
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -279,7 +279,7 @@ class wsBookParametres extends wsParametres {
 		                                                        'Essilor Recap' => 'com.fluidbook.player.basket.custom.essilorrecap.EssilorRecapBasketManager',
 		                                                        'Wesco Ventes' => 'com.fluidbook.player.basket.custom.wesco.WescoBasketManager'), 'grade' => 5);
 		$this->fields['basketReferences'] = array('type' => 'freefile', 'default' => '', 'editable' => true,
-		                                          'label' => __('Références produits'), 'grade' =>3, 'fileFilter' => $basketFilter, 'hint' => __('Fichier contenant les références produits'), 'dir' => 'commerce');
+		                                          'label' => __('Références produits'), 'grade' => 3, 'fileFilter' => $basketFilter, 'hint' => __('Fichier contenant les références produits'), 'dir' => 'commerce');
 		$this->fields['basketImages'] = array('type' => 'freefile', 'default' => '', 'editable' => true,
 		                                      'label' => __('Images des produits'), 'grade' => 5, 'fileFilter' => $imageFilter, 'hint' => __('Chaque image doit avoir pour nom exact la référence du produit'),
 		                                      'multiple' => true, 'dir' => 'commerce');
@@ -322,6 +322,7 @@ class wsBookParametres extends wsParametres {
 		                                                               __('Magazine tablette') => 'tab')
 		);
 		$this->fields['mobileTransitionDuration'] = array('type' => 'float', 'default' => '1.0', 'editable' => true, 'label' => __('Durée de la transition'));
+		$this->fields['mobileLinksRevealAnim'] = array('type' => 'boolean', 'default' => 'false', 'editable' => true, 'label' => __("Animer les liens après un changement de page"), 'grade' => 3);
 
 		$this->fields['mobileIconVector'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Utiliser les icônes vectorielles'));
 		$this->fields['mobileServerConfig'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Inclure les fichiers de configuration serveur'), 'grade' => 3);
@@ -335,7 +336,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', 'mobileLVersion', 'mobileVersion', 'mobileNavigationType', '|', 'mobileNavScale', '|', 'mobileTransitions', 'mobileTransitionDuration', '|', 'navOrderH', '|', 'mobileIconVector', 'mobileServerConfig', 'mobilePlugins', '|', 'mobileVideosPath', '|', 'mobileExtraXSpace', '|', 'mobileIgnoreBackgroundLinks'));
+		                               'fieldsnames' => array('alwaysHTML5', 'html5priority', 'mobileLVersion', 'mobileVersion', 'mobileNavigationType', '|', 'mobileNavScale', '|', 'mobileTransitions', 'mobileTransitionDuration', "mobileLinksRevealAnim", '|', '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');
 		$this->fields['phonegapVersion'] = array('type' => 'text', 'default' => '1.0.0', 'editable' => true, 'label' => __("Version de l'application"), 'grade' => 5, 'hint' => __('De la forme') . ' 1.2.3');
diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 3b8e2a704..472b4158b 100644
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -1143,6 +1143,7 @@ class wsHTML5Compiler {
 		$res[] = '.link a.displayArea:hover,.link a.displayArea.animating{background-color:' . self::colorToCSS($this->theme->parametres->linksColor, 0.4) . ';}';
 		$res[] = '.link a.displayArea:hover{opacity:1 !important;}';
 		$res[] = '.link a.displayArea{-webkit-tap-highlight-color:' . self::colorToCSS($this->theme->parametres->linksColor, 0.4) . ';background-color:' . self::colorToCSS($this->theme->parametres->linksColor, 0.0001) . ';}';
+		$res[] = '.link a.displayArea.animating {' . self::writeCSSUA('transition', 'opacity ' . $this->book->parametres->linkBlinkTime . 's ease-in') . '}';
 
 
 		// Bookmarks