(no commit message)

diff --git a/fluidbook/compile/index.html b/fluidbook/compile/index.html
index 327b7bf0b1751bd21d54d9edde4e1f11056198a7..3e1e6a5199623bd9519b138769924f23a53b7730 100644 (file)
--- a/fluidbook/compile/index.html
+++ b/fluidbook/compile/index.html
@@ -18,7 +18,7 @@ $redirectScript
 if(isMobile()){\r
        window.location='data/document.pdf';\r
 }else{\r
-       swfobject.embedSWF("$pathToIndex", "fluidbook", "100%", "100%", "10.0.0","", parseGet(),        {"allowScriptAccess":"always","quality":"high","scale":"noscale","wmode":getWmode(),"allowFullScreen":"true"},{"bgcolor":"#$bgcolor"});\r
+       swfobject.embedSWF("$pathToIndex", "fluidbook", "100%", "100%", "10.0.22","", parseGet(),       {"allowScriptAccess":"always","quality":"high","scale":"noscale","wmode":getWmode(),"allowFullScreen":"true"},{"bgcolor":"#$bgcolor"});\r
 }\r
 </script>\r
 $ga\r

diff --git a/inc/config.inc.php b/inc/config.inc.php
index 00b85459143b504725578b4a0425e7d27e5533bd..33113a9a9caebfd9d83c507a009c08f51b7396e6 100644 (file)
--- a/inc/config.inc.php
+++ b/inc/config.inc.php
@@ -10,6 +10,7 @@ define('FTPROOT', '/home/extranet/ftp/');
 define('WINDOWS', false);\r
 define('CONVERTER_PATH', '/bin:/usr/bin:/usr/local/bin:/home/extranet/www/fluidbook/tools:/usr/local/flex:/usr/local/secureSWF');\r
 define('MXMLC_PATH', '/usr/local/flex/bin/mxmlc');\r
+define('MXMLC_PATH_3', '/usr/local/flex_sdk_3.6/bin/mxmlc');\r
 define('AS3_SOURCES', '/home/ws/sources/as3');\r
 \r
 define('MONITOR_PERFS', true);\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index d55eff8c63151b3787eb451b6c00d66ede470ff7..1ecd46953f7bc39ca23a56f3cc4147f5c8ad9ad8 100644 (file)
--- 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'),\r
                        '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'),\r
                        'inline' => __('Vidéo : afficher dans la page'), 'video_width' => __('Vidéo : Largeur du popup'), 'video_height' => __('Vidéo : Hauteur du popup'),\r
-                       'interactive' => __('Interactivité'), 'video_service' => __('Webvideo : service')\r
+                       'interactive' => __('Interactivité'), 'video_service' => __('Webvideo : service'),\r
+                       'display_area'=>__('Afficher le lien au rollover')\r
                );\r
 \r
                $xls = new PHPExcel();\r
@@ -498,9 +499,14 @@ html{height:100%}' . "\n";
                                                if ($l[$id] == 'false') {\r
                                                        $l[$id] = 'physical';\r
                                                }\r
+                                       }else if($id=='display_area'){\r
+                                               if($l[$id]==''){\r
+                                                       $l[$id]='1';\r
+                                               }\r
                                        }\r
                                        $value = $l[$id];\r
                                }\r
+                               \r
                                $s->setCellValueByColumnAndRow($i, $j, $value);\r
                                $s->getStyleByColumnAndRow($i, $j)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);\r
                                $i++;\r
@@ -693,7 +699,7 @@ html{height:100%}' . "\n";
                $res.='if(isMobile()){' . "\n";\r
                $res.="\t" . 'window.location="data/document.pdf"' . "\n";\r
                $res.='} else {' . "\n";\r
-               $res .= "\t" . 'swfobject.embedSWF("index.swf", "fluidbook", "100%", "100%", "10.0.0",';\r
+               $res .= "\t" . 'swfobject.embedSWF("index.swf", "fluidbook", "100%", "100%", "10.0.22",';\r
                $res .= '"", [],';\r
                $res .= '{"allowScriptAccess":"always","quality":"high","scale":"noscale","wmode":getWmode(),"allowFullScreen":"true"},{"bgcolor":"#' . $theme->parametres->loadingBackColor . '"}';\r
                $res .= ');' . "\n";\r