(no commit message)

diff --git a/fluidbook/compile/_js/fluidbook.js b/fluidbook/compile/_js/fluidbook.js
index 7ad69ac650ebb97396c697c599cdad7e434e49c7..5b16bf53f22c0b852d8024ceae400346aa38c456 100644 (file)
--- a/fluidbook/compile/_js/fluidbook.js
+++ b/fluidbook/compile/_js/fluidbook.js
@@ -67,10 +67,13 @@ function getCookie(nom)
 }\r
 function setCookie(nom, valeur)\r
 {\r
+       date=new Date;\r
+       date.setFullYear(date.getFullYear()+10);\r
+\r
        var argv=setCookie.arguments;\r
        var argc=setCookie.arguments.length;\r
-       var expires=(argc > 2) ? argv[2] : null;\r
-       var path=(argc > 3) ? argv[3] : null;\r
+       var expires=(argc > 2) ? argv[2] : date;\r
+       var path=(argc > 3) ? argv[3] : '/';\r
        var domain=(argc > 4) ? argv[4] : null;\r
        var secure=(argc > 5) ? argv[5] : false;\r
        document.cookie=nom+"="+escape(valeur)+\r

diff --git a/fluidbook/tools/fwstk/.classpath b/fluidbook/tools/fwstk/.classpath
index e33b75030a86d2ba82a25f59866d49aefb180f1c..bb0d6e4f9c2eb33567a8ef4c79069748d2be6824 100644 (file)
--- a/fluidbook/tools/fwstk/.classpath
+++ b/fluidbook/tools/fwstk/.classpath
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
        <classpathentry kind="src" path="src"/>\r
-       <classpathentry kind="src" path="project_resources"/>\r
-       <classpathentry kind="src" path="resources"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
-       <classpathentry kind="lib" path="Java/jar/icu4j-4_6_1.jar"/>\r
-       <classpathentry excluding="com/fluidbook/fwstk/|com/fluidbook/fwstk/geom/" kind="src" path="Java"/>\r
+       <classpathentry excluding="com/fluidbook/fwstk/|com/fluidbook/fwstk/geom/|com/fluidbook/stats/|com/fluidbook/stats/lists/" kind="src" path="Java"/>\r
+       <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
        <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/fluidbook/tools/fwstk/.project b/fluidbook/tools/fwstk/.project
index 3fc75ba511fbb6bcb5caedfc74fb0f64ed620695..79960233be11d500eeebda9ffc528bc640606c2f 100644 (file)
--- a/fluidbook/tools/fwstk/.project
+++ b/fluidbook/tools/fwstk/.project
@@ -20,10 +20,5 @@
                        <type>2</type>\r
                        <location>H:/Works/Java</location>\r
                </link>\r
-               <link>\r
-                       <name>resources</name>\r
-                       <type>2</type>\r
-                       <locationURI>WORKSPACE_LOC/Java/resources</locationURI>\r
-               </link>\r
        </linkedResources>\r
 </projectDescription>\r

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index fb24921f0f4e371ffc303031ecda956ea0f2ebd0..b85e4e1074b455470228c258d449b42117812eb0 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -720,24 +720,27 @@ class wsDAOBook extends commonDAO {
                        if (file_exists($referencesFile)) {\r
                                $xml = simplexml_load_file($referencesFile);\r
                                $i = 0;\r
-                               $allref=array();\r
+                               $allref = array();\r
                                foreach ($xml->item as $item) {\r
                                        $ref = (string) $item['reference'];\r
-                                       if(isset($allref[$ref])){\r
+                                       if (isset($allref[$ref])) {\r
                                                continue;\r
                                        }\r
-                                       $allref[$ref]=true;\r
+                                       $allref[$ref] = true;\r
                                        foreach ($formats as $f) {\r
                                                $refimage = $workingDir . 'commerce/' . $ref . '.' . $f;\r
                                                if (file_exists($refimage)) {\r
-                                                       $flex->addBitmap($refimage, "basket_image_". $ref);\r
+                                                       $flex->addBitmap($refimage, "basket_image_" . $ref);\r
                                                        break;\r
                                                }\r
                                        }\r
                                        $i++;\r
                                }\r
                        }\r
-                       $flex->addVariable('basketReferences', cubeXML::condense($xml->asXML()),false,true, "String");\r
+                       $flex->addVariable('basketReferences', cubeXML::condense($xml->asXML()), false, true, "String");\r
+                       if ($book->parametres->basketPDFBackground != '') {\r
+                               $flex->addByteArray($workingDir . 'commerce/' . $book->parametres->basketPDFBackground, 'basket_pdf_background');\r
+                       }\r
                }\r
                // Fonts\r
                $flex->addFont(FONT_PATH . '/' . $lang->font, 'GeneralFont', $lang->charset);\r

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 6d4b8f8778a8d0ef61b4b61008008a5933570da5..58cfdac262dc6aa98e74e1a3634a3f28bad15f5c 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -116,6 +116,10 @@ class wsBookParametres extends wsParametres {
                $imageFilter->name = __('Images') . ' (*.jpg, *.png)';\r
                $imageFilter->extensions = '*.jpg;*.jpeg;*.png';\r
 \r
+               $epsFilter = new stdClass();\r
+               $epsFilter->name = __('Fichier vectoriel') . ' (*.ai, *.eps)';\r
+               $epsFilter->extensions = '*.ai;*.eps';\r
+\r
                $this->fields['chaptersPage'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Faire pointer le sommaire sur la page'), 'grade' => 3, 'hint' => __('Laisser vide pour utiliser le sommaire classique'), 'size' => 5);\r
                $this->fields['displayChaptersAtStart'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Afficher le sommaire au chargement de la publication"), 'grade' => 3);\r
                $this->fields['externalChapters'] = array('type' => 'freefile', 'default' => '', 'editable' => true,\r
@@ -143,13 +147,15 @@ class wsBookParametres extends wsParametres {
                        'datas' => array(__('Classic') => 'com.fluidbook.player.basket.BasketManager',\r
                                __('Essilor') => 'com.fluidbook.player.basket.custom.essilor.EssilorBasketManager'), 'grade' => 5);\r
                $this->fields['basketReferences'] = array('type' => 'freefile', 'default' => '', 'editable' => true,\r
-                       'label' => __('Références produits'), 'grade' => 5, 'fileFilter' => $basketFilter, 'hint' => __('Fichier contenant les références produits'),'dir'=>'commerce');\r
+                       'label' => __('Références produits'), 'grade' => 5, 'fileFilter' => $basketFilter, 'hint' => __('Fichier contenant les références produits'), 'dir' => 'commerce');\r
                $this->fields['basketImages'] = array('type' => 'freefile', 'default' => '', 'editable' => true,\r
                        'label' => __('Images des produits'), 'grade' => 5, 'fileFilter' => $imageFilter, 'hint' => __('Chaque image doit avoir pour nom exact la référence du produit'),\r
                        'multiple' => true, 'dir' => 'commerce');\r
+               $this->fields['basketPDFBackground'] = array('type' => 'freefile', 'default' => '', 'editable' => true,\r
+                       'label' => __('Fond du PDF (bon de commande)'), 'grade' => 5, 'fileFilter' => $epsFilter, 'hint' => __('Fond du bon de commande'), 'dir' => 'commerce');\r
 \r
                $this->forms['basket'] = array('label' => __('Panier'),\r
-                       'fieldsnames' => array('basket', 'basketManager', 'basketReferences', 'basketImages'));\r
+                       'fieldsnames' => array('basket', 'basketManager', 'basketReferences', 'basketImages', 'basketPDFBackground'));\r
                // .\r
                $this->fields['offlineLink'] = array('type' => 'text', 'default' => 'http://', 'editable' => true, 'label' => __("URL du Fluidbook"), 'hint' => 'URL du fluidbook utilisée pour la version Offline (CD-ROM, clé USB, Exécutables)');\r
                $this->forms['offline'] = array('label' => __('Version offline'),\r

diff --git a/inc/ws/Util/packager/class.ws.packager.php b/inc/ws/Util/packager/class.ws.packager.php
index 1f22c9ec186dbd80232a94f5a529bfdcd46ef996..ca61d45c040542d7180adad9efb74b98e89ee2c6 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.php
+++ b/inc/ws/Util/packager/class.ws.packager.php
@@ -168,8 +168,12 @@ class wsPackager {
        }\r
 \r
        protected function moveDatasSWF() {\r
-               rename($this->vdir . '/FluidbookDatas.swf', $this->vdir . '/data/FluidbookDatas.swf');\r
-               rename($this->vdir . '/FluidbookDatasLight.swf', $this->vdir . '/data/FluidbookDatasLight.swf');\r
+               if (file_exists($this->vdir . '/FluidbookDatas.swf')) {\r
+                       rename($this->vdir . '/FluidbookDatas.swf', $this->vdir . '/data/FluidbookDatas.swf');\r
+               }\r
+               if (file_exists($this->vdir . '/FluidbookDatasLight.swf')) {\r
+                       rename($this->vdir . '/FluidbookDatasLight.swf', $this->vdir . '/data/FluidbookDatasLight.swf');\r
+               }\r
        }\r
 \r
        protected function postPackage() {\r

diff --git a/inc/ws/Util/packager/class.ws.packager.win.cd.php b/inc/ws/Util/packager/class.ws.packager.win.cd.php
index 60f1a1f2913ce34adabb2fd1b3acef105eedf0e2..d3707f6c385427020bed2b5a6d8d213fe5f9bce3 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.win.cd.php
+++ b/inc/ws/Util/packager/class.ws.packager.win.cd.php
@@ -11,8 +11,8 @@ class wsPackagerWinCD extends wsPackagerMacEXE {
                parent::preparePackage();\r
 \r
                $this->copyOtherFiles(array(\r
-                       'fluidbook.ico' => 'data/fluidbook.ico', '\r
-                       autorun.inf',\r
+                       'fluidbook.ico' => 'data/fluidbook.ico',\r
+                       'autorun.inf',\r
                        'Fluidbook.exe' => 'Windows-PC-' . $this->exeName . '.exe',\r
                        'Fluidbook.app.zip'));\r
                $this->replaceAutorun();\r
@@ -21,7 +21,7 @@ class wsPackagerWinCD extends wsPackagerMacEXE {
 \r
        public function replaceAutorun() {\r
                $inf = file_get_contents($this->vdir . 'autorun.inf');\r
-               $toReplace = array('title' => $this->book->parametres->title, 'exe' => $this->exeName);\r
+               $toReplace = array('title' => $this->book->parametres->title, 'exe' => 'Windows-PC-' . $this->exeName . '.exe');\r
                $inf = $this->replaceContents($inf, $toReplace);\r
                file_put_contents($this->vdir . 'autorun.inf', $inf);\r
        }\r