(no commit message)

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 88119da14659538a13f816ec322f62cc21284865..500304e024077e0991ee7d8aaaa98fd3a39eea63 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -102,9 +102,13 @@ class wsBookParametres extends wsParametres {
                $swfFilter->name = __('Animation SWF') . ' (*.swf)';\r
                $swfFilter->extensions = '*.swf';\r
 \r
-               $xmlFilter = new stdClass();\r
-               $xmlFilter->name = __('Document XML') . ' (.xml)';\r
-               $xmlFilter->extensions = '.xml';\r
+               $basketFilter = new stdClass();\r
+               $basketFilter->name = __('Liste de produits') . ' (*.xml, *.csv)';\r
+               $basketFilter->extensions = '*.xml;*.csv';\r
+\r
+               $imageFilter = new stdClass();\r
+               $imageFilter->name = __('Images') . ' (*.jpg, *.png)';\r
+               $imageFilter->extensions = '*.jpg;*.jpeg;*.png';\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
@@ -129,12 +133,15 @@ class wsBookParametres extends wsParametres {
                // .\r
                $this->fields['basket'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Panier activé'), 'grade' => 5);\r
                $this->fields['basketReferences'] = array('type' => 'freefile', 'default' => '', 'editable' => true,\r
-                       'label' => __('Références produits'), 'grade' => 5, 'fileFilter' => $xmlFilter, 'hint' => __('Fichier contenant les références produits'));\r
+                       'label' => __('Références produits'), 'grade' => 5, 'fileFilter' => $basketFilter, 'hint' => __('Fichier contenant les références produits'));\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);\r
                $this->fields['basketDisplayedFields'] = array('type' => 'textarea', 'editable' => true, 'label' => 'Infos produits à afficher', 'default' => 'image,reference,name,quantity,dimensions,price', 'grade' => 5,\r
                        'hint' => __('Valeurs possible : name, quantity, price, reference, image, dimensions'));\r
 \r
                $this->forms['basket'] = array('label' => __('Panier'),\r
-                       'fieldsnames' => array('basket', 'basketReferences', 'basketDisplayedFields'));\r
+                       'fieldsnames' => array('basket', 'basketReferences', 'basketImages', 'basketDisplayedFields'));\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/swf/_src/WSComposer.as3proj b/swf/_src/WSComposer.as3proj
index af787e73c1e896a8131c7a0e9f1b55eaf9177762..eec8e4494ab1917c912c903acbd19a0408d44c8a 100644 (file)
--- a/swf/_src/WSComposer.as3proj
+++ b/swf/_src/WSComposer.as3proj
@@ -70,7 +70,7 @@
   </library>\r
   <!-- Class files to compile (other referenced classes will automatically be included) -->\r
   <compileTargets>\r
-    <compile path="com\fluidbook\ws\composer\MainLocal.as" />\r
+    <compile path="com\fluidbook\ws\composer\Main.as" />\r
   </compileTargets>\r
   <!-- Paths to exclude from the Project Explorer tree -->\r
   <hiddenPaths>\r
@@ -84,7 +84,7 @@
   <!-- Executed before build -->\r
   <preBuildCommand />\r
   <!-- Executed after build -->\r
-  <postBuildCommand alwaysRun="False">"$(ToolsDir)\PuTTY\pscp.exe" "$(OutputDir)\$(OutputName)" extranet@fluidbook.com:/home/extranet/dev/swf</postBuildCommand>\r
+  <postBuildCommand alwaysRun="False">"$(ToolsDir)\PuTTY\pscp.exe" "$(OutputDir)\$(OutputName)" extranet@fluidbook.com:/home/extranet/www/swf</postBuildCommand>\r
   <!-- Other project options -->\r
   <options>\r
     <option showHiddenPaths="False" />\r