From ac46748588bfc40ebb26dcdd2508a3e24e92eaf3 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 27 Apr 2011 15:45:49 +0000
Subject: [PATCH]

---
 inc/ws/Metier/class.ws.book.parametres.php | 17 ++++++++++++-----
 swf/_src/WSComposer.as3proj                |  4 ++--
 2 files changed, 14 insertions(+), 7 deletions(-)

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