From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 28 Jun 2011 08:36:09 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=7921582bb8c7bce9f5311cb63affeae90773d424;p=cubeextranet.git

---

diff --git a/fluidbook/compile/_zinc/Fluidbook.zinc b/fluidbook/compile/_zinc/Fluidbook.zinc
new file mode 100644
index 000000000..7729d9d8a
Binary files /dev/null and b/fluidbook/compile/_zinc/Fluidbook.zinc differ
diff --git a/fluidbook/compile/_zinc/FluidbookWIN.zinc b/fluidbook/compile/_zinc/FluidbookWIN.zinc
deleted file mode 100644
index 7729d9d8a..000000000
Binary files a/fluidbook/compile/_zinc/FluidbookWIN.zinc and /dev/null differ
diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 58cfdac26..de50f928f 100644
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -120,8 +120,10 @@ class wsBookParametres extends wsParametres {
 		$epsFilter->name = __('Fichier vectoriel') . ' (*.ai, *.eps)';
 		$epsFilter->extensions = '*.ai;*.eps';
 
+		$this->fields['displayChaptersIcon'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Affiche l'icône du sommaire"), 'grade' => 1);
 		$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);
+		$this->fields['chaptersColumns'] = array('type' => 'integer', 'default' => 1, 'editable' => true, 'label' => __('Afficher le sommaire sur x colonne(s)'), 'grade' => 5);
 		$this->fields['externalChapters'] = array('type' => 'freefile', 'default' => '', 'editable' => true,
 			'label' => __('Sommaire personnalisé'), 'grade' => 3, 'fileFilter' => $swfFilter, 'hint' => __('Laisser vide pour utiliser le sommaire classique'));
 		$this->fields['fullExternalChapters'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Sommaire totalement personnalisé"), 'grade' => 3, 'hint' => __('Supprime la flèche de fermeture, titre prédéfini et couleur de fond'));
@@ -130,7 +132,7 @@ class wsBookParametres extends wsParametres {
 			'label' => __('SWF pour onglets personnalisés'), 'grade' => 3, 'fileFilter' => $swfFilter);
 
 		$this->forms['sommaire'] = array('label' => __('Sommaire'),
-			'fieldsnames' => array('displayChaptersAtStart', 'chaptersPage', '|', 'externalChapters', 'fullExternalChapters', '|', 'ongletsSWF', 'ongletsXML'));
+			'fieldsnames' => array('displayChaptersIcon','displayChaptersAtStart', 'chaptersPage', '|', 'chaptersColumns', '|', 'externalChapters', 'fullExternalChapters', '|', 'ongletsSWF', 'ongletsXML'));
 		// .
 		$this->fields['permanentLinks'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Liens visibles en permanence'), 'grade' => 3);
 		$this->forms['multimedia'] = array('label' => __('Liens et multimédia'),
diff --git a/swf/_src/composerLibrary.swc b/swf/_src/composerLibrary.swc
index c765aae5f..86dd41917 100644
Binary files a/swf/_src/composerLibrary.swc and b/swf/_src/composerLibrary.swc differ
diff --git a/swf/_src/wsComposerLibrary.fla b/swf/_src/wsComposerLibrary.fla
index b96667d95..69e206dd1 100644
Binary files a/swf/_src/wsComposerLibrary.fla and b/swf/_src/wsComposerLibrary.fla differ