wip #4193 @0.25

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index a00ad923943a3de2f693e37ab6a398d105da4eb9..930e4fda2a627e525a4ad86a180aeecad50bb808 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -463,6 +463,7 @@ class wsBookParametres extends wsParametres
         $this->fields['tabsPages'] = ['type' => 'text', 'label' => __('Pages des onglets'), 'editable' => true, 'default' => '', 'grade' => 5, 'hint' => __('Numéros de pages séparas par une virgule')];
         $this->fields['tabsSections'] = ['type' => 'text', 'label' => __('Sections des onglets'), 'editable' => true, 'default' => '', 'grade' => 5, 'hint' => __('Numéros de pages séparés par une virgule')];
         $this->fields['tabsPagesNumbers'] = ['type' => 'combo', 'label' => __('Numérotation utilisée'), 'editable' => true, 'default' => 'virtual', 'grade' => 5, 'datas' => $pagesNumbers];
+        $this->fields['tabsHideOnPages'] = ['type' => 'text', 'label' => __('Cacher les onglets sur les pages'), 'editable' => true, 'default' => '', 'grade' => 5, 'hint' => '1-3,5 = 1,2,3,5'];
         $this->fields['tabsHideOnCover'] = ['type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Cacher les onglets sur la couverture'), 'grade' => 5];
         $this->fields['tabsHideOnLastPage'] = ['type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Cacher les onglets sur la dernière page'), 'grade' => 5];
         $this->fields['tabsHideOnPortrait'] = ['type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Cacher les onglets lorsque le fluidbook est en mode portrait'), 'grade' => 5];
@@ -479,7 +480,7 @@ class wsBookParametres extends wsParametres
         $this->fields['tabsMargin'] = ['type' => 'float', 'label' => __('Marge des onglets'), 'editable' => true, 'default' => '-10', 'grade' => 5, 'hint' => __('Une marge négative = les onglets passent sous la publication')];
         $this->fields['tabsLinkWidth'] = ['type' => 'float', 'label' => __('Largeur des onglets'), 'editable' => true, 'default' => '100', 'grade' => 5, 'hint' => __('Largeur réservée pour les onglets et largeur de la zone cliquable des liens')];
         $this->forms['tabs'] = ['label' => __('Onglets'),
-            'fieldsnames' => ['tabsHTML5', 'tabsPages', 'tabsSections', 'tabsPagesNumbers', '|', 'tabsSide', 'tabsMargin', '|', 'tabsHideOnCover', 'tabsHideOnLastPage', 'tabsHideEdges', '|', 'tabsPriority', 'tabsLinkWidth', 'tabsHideWhenOverlapingArrows', 'tabsHideOnPortrait', 'tabsHideOnZoom']];
+            'fieldsnames' => ['tabsHTML5', 'tabsPages', 'tabsSections', 'tabsPagesNumbers', '|', 'tabsSide', 'tabsMargin', '|', 'tabsHideOnPages', 'tabsHideOnCover', 'tabsHideOnLastPage', 'tabsHideEdges', '|', 'tabsPriority', 'tabsLinkWidth', 'tabsHideWhenOverlapingArrows', 'tabsHideOnPortrait', 'tabsHideOnZoom']];
 
         /*** **/
 

diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
index a10d6f12efd2e9c6d8e3460d5c6b555c93794dc9..9ccc1159ab6290a8eec0de2a6c9addab2c157f52 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -348,6 +348,14 @@ class wsHTML5Compiler
         $this->config->bookmarkDisablePages = cubeArray::parseRange($this->config->bookmarkDisablePages);
         $this->config->rasterizePages = cubeArray::parseRange($this->config->rasterizePages);
         $this->config->vectorPages = array_diff(cubeArray::parseRange($this->config->vectorPages), $this->config->rasterizePages);
+        $this->config->tabsHideOnPages = cubeArray::parseRange($this->config->tabsHideOnPages);
+        if ($this->config->tabsHideOnCover) {
+            $this->config->tabsHideOnPages[] = 0;
+            $this->config->tabsHideOnPages[] = 1;
+        }
+        if ($this->config->tabsHideOnLastPage) {
+            $this->config->tabsHideOnPages[] = count($this->pages);
+        }
         $this->config->triggersLinks = [];
         $this->config->hasContentLock = false;
     }