(no commit message)

diff --git a/fluidbook/compile/_zinc/Fluidbook.zinc b/fluidbook/compile/_zinc/Fluidbook.zinc
new file mode 100644 (file)
index 0000000..7729d9d
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 (file)
index 7729d9d..0000000
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 58cfdac262dc6aa98e74e1a3634a3f28bad15f5c..de50f928f48fc2305ff376fd4587f1943e1ce07b 100644 (file)
--- 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)';\r
                $epsFilter->extensions = '*.ai;*.eps';\r
 \r
+               $this->fields['displayChaptersIcon'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Affiche l'icône du sommaire"), 'grade' => 1);\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['chaptersColumns'] = array('type' => 'integer', 'default' => 1, 'editable' => true, 'label' => __('Afficher le sommaire sur x colonne(s)'), 'grade' => 5);\r
                $this->fields['externalChapters'] = array('type' => 'freefile', 'default' => '', 'editable' => true,\r
                        'label' => __('Sommaire personnalisé'), 'grade' => 3, 'fileFilter' => $swfFilter, 'hint' => __('Laisser vide pour utiliser le sommaire classique'));\r
                $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'));\r
@@ -130,7 +132,7 @@ class wsBookParametres extends wsParametres {
                        'label' => __('SWF pour onglets personnalisés'), 'grade' => 3, 'fileFilter' => $swfFilter);\r
 \r
                $this->forms['sommaire'] = array('label' => __('Sommaire'),\r
-                       'fieldsnames' => array('displayChaptersAtStart', 'chaptersPage', '|', 'externalChapters', 'fullExternalChapters', '|', 'ongletsSWF', 'ongletsXML'));\r
+                       'fieldsnames' => array('displayChaptersIcon','displayChaptersAtStart', 'chaptersPage', '|', 'chaptersColumns', '|', 'externalChapters', 'fullExternalChapters', '|', 'ongletsSWF', 'ongletsXML'));\r
                // .\r
                $this->fields['permanentLinks'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Liens visibles en permanence'), 'grade' => 3);\r
                $this->forms['multimedia'] = array('label' => __('Liens et multimédia'),\r

diff --git a/swf/_src/composerLibrary.swc b/swf/_src/composerLibrary.swc
index c765aae5fd7f4ebcc062a515e80e1ab776f02e95..86dd41917301ef917a33e48e04dd1309a9546a0b 100644 (file)
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 b96667d9557efbb4d05611ac65d5a10778d1e6e8..69e206dd1ae9145691d97868fbceb041f9cc03d1 100644 (file)
Binary files a/swf/_src/wsComposerLibrary.fla and b/swf/_src/wsComposerLibrary.fla differ