From 1ddd11163022804c33fec3567d8ca1017b023d65 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Mon, 23 Jan 2012 14:28:13 +0000 Subject: [PATCH] --- inc/ws/Metier/class.ws.book.parametres.php | 3 ++- inc/ws/Util/packager/class.ws.packager.html.php | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php index e742431ea..a950da205 100644 --- 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"), 'datas' => array(__('Centré') => 'center', __("Aligné sur l'icône") => 'chaptersIcon')); + $this->fields['chaptersCascade'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Sommaire en cascade"), 'grade' => 3); $this->forms['sommaire'] = array('label' => __('Sommaire'), - 'fieldsnames' => array('displayChaptersIcon', 'displayChaptersAtStart', 'chaptersPage', 'chaptersPosition', '|', 'chaptersColMaxWidth', 'chaptersColumns','displayChaptersLine', '|', 'externalChapters', 'fullExternalChapters', '|', 'ongletsSWF', 'ongletsXML')); + 'fieldsnames' => array('displayChaptersIcon', 'displayChaptersAtStart', 'chaptersPage', 'chaptersPosition','chaptersCascade', '|', 'chaptersColMaxWidth', 'chaptersColumns', 'displayChaptersLine', '|', 'externalChapters', 'fullExternalChapters', '|', 'ongletsSWF', 'ongletsXML')); // . $this->fields['customLinkClass'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Classe pour les liens personnalisés'), 'grade' => 5); $this->fields['permanentLinks'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Liens visibles en permanence'), 'grade' => 3); diff --git a/inc/ws/Util/packager/class.ws.packager.html.php b/inc/ws/Util/packager/class.ws.packager.html.php index 727ef0f90..6cb3b3e27 100644 --- 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); $cp->execute(); + $filesToAdd = array('.htaccess', 'web.config'); + foreach ($filesToAdd as $f) { + copy(WS_COMPILE_ASSETS . '/_html5/' . $f, $dest . '/' . $f); + } + $filesToDelete = array('indext.html', 'indexu.html', 'data/datas.js'); if ($this->book->parametres->mobileVersion == 'html5') { $filesToDelete[] = 'data/background/*/t*.jpg'; -- 2.39.5