From bf01c353616f27f68435b2d49bc2abe72fd8a32b Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 8 Jul 2011 13:31:11 +0000
Subject: [PATCH]

---
 fluidbook/compile/index.html        |  2 +-
 inc/config.inc.php                  |  1 +
 inc/ws/Controlleur/class.ws.url.php | 10 ++++++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/fluidbook/compile/index.html b/fluidbook/compile/index.html
index 327b7bf0b..3e1e6a519 100644
--- a/fluidbook/compile/index.html
+++ b/fluidbook/compile/index.html
@@ -18,7 +18,7 @@ $redirectScript
 if(isMobile()){
 	window.location='data/document.pdf';
 }else{
-	swfobject.embedSWF("$pathToIndex", "fluidbook", "100%", "100%", "10.0.0","", parseGet(),	{"allowScriptAccess":"always","quality":"high","scale":"noscale","wmode":getWmode(),"allowFullScreen":"true"},{"bgcolor":"#$bgcolor"});
+	swfobject.embedSWF("$pathToIndex", "fluidbook", "100%", "100%", "10.0.22","", parseGet(),	{"allowScriptAccess":"always","quality":"high","scale":"noscale","wmode":getWmode(),"allowFullScreen":"true"},{"bgcolor":"#$bgcolor"});
 }
 </script>
 $ga
diff --git a/inc/config.inc.php b/inc/config.inc.php
index 00b854591..33113a9a9 100644
--- a/inc/config.inc.php
+++ b/inc/config.inc.php
@@ -10,6 +10,7 @@ define('FTPROOT', '/home/extranet/ftp/');
 define('WINDOWS', false);
 define('CONVERTER_PATH', '/bin:/usr/bin:/usr/local/bin:/home/extranet/www/fluidbook/tools:/usr/local/flex:/usr/local/secureSWF');
 define('MXMLC_PATH', '/usr/local/flex/bin/mxmlc');
+define('MXMLC_PATH_3', '/usr/local/flex_sdk_3.6/bin/mxmlc');
 define('AS3_SOURCES', '/home/ws/sources/as3');
 
 define('MONITOR_PERFS', true);
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index d55eff8c6..1ecd46953 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -465,7 +465,8 @@ html{height:100%}' . "\n";
 			'display_area' => __('Activer la surbrillance'),
 			'video_loop' => __('Video : boucle'), 'video_auto_start' => __('Video : démarrage automatique'), 'video_controls' => __('Vidéo : afficher les contrôles'), 'video_sound_on' => __('Vidéo : activer le son'),
 			'inline' => __('Vidéo : afficher dans la page'), 'video_width' => __('Vidéo : Largeur du popup'), 'video_height' => __('Vidéo : Hauteur du popup'),
-			'interactive' => __('Interactivité'), 'video_service' => __('Webvideo : service')
+			'interactive' => __('Interactivité'), 'video_service' => __('Webvideo : service'),
+			'display_area'=>__('Afficher le lien au rollover')
 		);
 
 		$xls = new PHPExcel();
@@ -498,9 +499,14 @@ html{height:100%}' . "\n";
 						if ($l[$id] == 'false') {
 							$l[$id] = 'physical';
 						}
+					}else if($id=='display_area'){
+						if($l[$id]==''){
+							$l[$id]='1';
+						}
 					}
 					$value = $l[$id];
 				}
+				
 				$s->setCellValueByColumnAndRow($i, $j, $value);
 				$s->getStyleByColumnAndRow($i, $j)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
 				$i++;
@@ -693,7 +699,7 @@ html{height:100%}' . "\n";
 		$res.='if(isMobile()){' . "\n";
 		$res.="\t" . 'window.location="data/document.pdf"' . "\n";
 		$res.='} else {' . "\n";
-		$res .= "\t" . 'swfobject.embedSWF("index.swf", "fluidbook", "100%", "100%", "10.0.0",';
+		$res .= "\t" . 'swfobject.embedSWF("index.swf", "fluidbook", "100%", "100%", "10.0.22",';
 		$res .= '"", [],';
 		$res .= '{"allowScriptAccess":"always","quality":"high","scale":"noscale","wmode":getWmode(),"allowFullScreen":"true"},{"bgcolor":"#' . $theme->parametres->loadingBackColor . '"}';
 		$res .= ');' . "\n";
-- 
2.39.5