(no commit message)

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index e742431ea7abaa0c55879aef64fecfc54c7e97bd..a950da205e293580331750fc19fa668d354e60d1 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -150,9 +150,10 @@ class wsBookParametres extends wsParametres {
                $this->fields['chaptersPosition'] = array('type' => 'combo', 'default' => 'center', 'editable' => true, 'label' => __("Position du sommaire"),\r
                        'datas' => array(__('Centré') => 'center',\r
                                __("Aligné sur l'icône") => 'chaptersIcon'));\r
+               $this->fields['chaptersCascade'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Sommaire en cascade"), 'grade' => 3);\r
 \r
                $this->forms['sommaire'] = array('label' => __('Sommaire'),\r
-                       'fieldsnames' => array('displayChaptersIcon', 'displayChaptersAtStart', 'chaptersPage', 'chaptersPosition', '|', 'chaptersColMaxWidth', 'chaptersColumns','displayChaptersLine', '|', 'externalChapters', 'fullExternalChapters', '|', 'ongletsSWF', 'ongletsXML'));\r
+                       'fieldsnames' => array('displayChaptersIcon', 'displayChaptersAtStart', 'chaptersPage', 'chaptersPosition','chaptersCascade', '|', 'chaptersColMaxWidth', 'chaptersColumns', 'displayChaptersLine', '|', 'externalChapters', 'fullExternalChapters', '|', 'ongletsSWF', 'ongletsXML'));\r
                // .\r
                $this->fields['customLinkClass'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Classe pour les liens personnalisés'), 'grade' => 5);\r
                $this->fields['permanentLinks'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Liens visibles en permanence'), 'grade' => 3);\r

diff --git a/inc/ws/Util/packager/class.ws.packager.html.php b/inc/ws/Util/packager/class.ws.packager.html.php
index 727ef0f90fe0355e9397158cef4669b9ae66bc47..6cb3b3e27bc99669f592886cd6d817333622009e 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.html.php
@@ -150,6 +150,11 @@ class wsPackagerHTML extends wsPackager {
                $cp->setArg(null, $dest);\r
                $cp->execute();\r
 \r
+               $filesToAdd = array('.htaccess', 'web.config');\r
+               foreach ($filesToAdd as $f) {\r
+                       copy(WS_COMPILE_ASSETS . '/_html5/' . $f, $dest . '/' . $f);\r
+               }\r
+\r
                $filesToDelete = array('indext.html', 'indexu.html', 'data/datas.js');\r
                if ($this->book->parametres->mobileVersion == 'html5') {\r
                        $filesToDelete[] = 'data/background/*/t*.jpg';\r