From: vincent@cubedesigners.com Date: Wed, 13 Oct 2021 10:44:56 +0000 (+0000) Subject: wip #4777 @0.25 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=409b026aa3bfbdbbe72569e4aa2c0d6d381dfb86;p=cubeextranet.git wip #4777 @0.25 --- diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php index 14d50f6b9..54ac923e1 100644 --- a/inc/ws/Metier/class.ws.book.parametres.php +++ b/inc/ws/Metier/class.ws.book.parametres.php @@ -295,10 +295,12 @@ class wsBookParametres extends wsParametres $this->fields['imageFormat'] = array('type' => 'combo', 'default' => 'jpg', 'editable' => true, 'datas' => array(/*__('Le plus léger') => 'best', */ 'JPEG' => 'jpg', 'PNG' => 'png'), 'grade' => 2, 'label' => __('Format des images')); $this->fields['svgToCanvasUpscale'] = ['type' => 'float', 'default' => 1, 'editable' => true, 'label' => __('Upscale de la fonction svgtocanvas')]; + $this->fields['textsThickness'] = ['type' => 'float', 'default' => 1, 'editable' => true, 'label' => __('Epaisseur des textes')]; + $this->fields['textsThicknessPages'] = ['type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Appliquer l\'épaisseur des texte sur les pages')]; $this->fields['dynamicBackgroundColor'] = ['type' => 'textarea', 'default' => '', 'editable' => true, 'label' => 'Couleur de fond dynamique', 'grade' => 3]; $this->forms['3d_mode'] = array('label' => __('Options de visualisation'), - 'fieldsnames' => array('mobileNavigationType', '|', 'mobileTransitions', 'mobileTransitionDuration', '|', 'forceWhiteBackground', 'rasterizePages', 'vectorPages', 'visualisationMode', 'antialiasReading', 'correctCenter', 'pagesBaseAngle', 'centerBook', '|', 'extraXSpace', 'mobileExtraXSpace', 'extraYSpace', '|', 'viewMode', '|', 'dynamicBackgroundColor', '|', 'svgToCanvasUpscale', '|', 'imageFormat', 'maxResolution', 'JPEGQuality')); + 'fieldsnames' => array('mobileNavigationType', '|', 'mobileTransitions', 'mobileTransitionDuration', '|', 'forceWhiteBackground', 'rasterizePages', 'vectorPages', 'visualisationMode', 'antialiasReading', 'correctCenter', 'pagesBaseAngle', 'centerBook', '|', 'extraXSpace', 'mobileExtraXSpace', 'extraYSpace', '|', 'viewMode', '|', 'dynamicBackgroundColor', '|', 'svgToCanvasUpscale','textsThickness','textsThicknessPages', '|', 'imageFormat', 'maxResolution', 'JPEGQuality')); $this->fields['rasterizeOnSafari'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Ecraser les pages pour Safari (Mac OS)'), 'grade' => 1); $this->forms['performances'] = ['label' => __('Performances'), 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 21863dc19..9dcaa7804 100644 --- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php +++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php @@ -2070,6 +2070,16 @@ height="0" width="0" style="display:none;visibility:hidden"> } } $this->config->dynamicBackgroundColor = $dbc; + if ($this->book->parametres->textsThickness > 1) { + if ($this->book->parametres->textsThicknessPages == '') { + $this->config->textsThicknessPages = range(1, $this->book->parametres->pages); + } else { + $this->config->textsThicknessPages = cubeArray::parseRange($this->book->parametres->textsThicknessPages); + } + } else { + $this->config->textsThickness = 1; + $this->config->textsThicknessPages = []; + } // Content locks uasort($this->content_lock, function ($a, $b) {