done #1840 @0.5

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index d535d974c928511c5fd69e01cce7ebdaba7c12f1..b8bdfc42b73cfd82b6561c26b06ff0deb999e7dd 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -136,8 +136,9 @@ class wsBookParametres extends wsParametres {
                $this->fields['extraYSpace'] = array('type' => 'integer', 'default' => '0', 'editable' => true, 'label' => __('Marge supplémentaire verticale'), 'grade' => 3);
                $this->fields['centerBook'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Centrer la publication sur les couvertures'), 'grade' => 2);
                $this->fields['correctCenter'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Corriger les lignes blanches entre les pages'), 'grade' => 2);
+               $this->fields['maxResolution'] = array('type' => 'combo', 'default' => 300, 'editable' => true, 'datas' => array('300dpi' => 300, '150dpi' => 150), 'grade' => 2, 'label' => __('Résolution maximale des pages'));
                $this->forms['3d_mode'] = array('label' => __('Options de visualisation'),
-                                               'fieldsnames' => array('visualisationMode', 'antialiasReading', 'correctCenter', 'pagesBaseAngle', 'centerBook', '|', 'extraXSpace', 'extraYSpace', '|', 'viewMode'));
+                                               'fieldsnames' => array('visualisationMode', 'antialiasReading', 'correctCenter', 'pagesBaseAngle', 'centerBook', '|', 'extraXSpace', 'extraYSpace', '|', 'viewMode', '|', 'maxResolution'));
 
                $this->fields['preload'] = array('type' => 'integer', 'default' => 16, 'editable' => true, 'label' => __('Nombre de pages à précharger'), 'grade' => 3);
 

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 9380b17965fff92993f7654445f9e9e327efd331..6a6a20637eb70571fd1d5ab12c2a2be60531e142 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -756,6 +756,13 @@ class wsHTML5Compiler {
                        $this->vdir->copy($this->wdir . '/' . $this->book->parametres->navExtraImageMobile, 'data/images/' . $this->book->parametres->navExtraImageMobile);
                }
 
+               for ($i = 1; $i <= 5; $i++) {
+                       $ic = $this->book->parametres->{'navExtraIcon' . $i};
+                       if ($ic != '') {
+                               $this->vdir->copy($this->wdir . '/' . $ic, 'data/images/' . $ic);
+                       }
+               }
+
        }
 
        protected function writeLinks() {
@@ -1019,7 +1026,7 @@ class wsHTML5Compiler {
                $this->config->videoFormats = $this->getVideosFormats(false);
                $this->config->htmlmultimedia = $this->htmlmultimedia;
                $this->config->phonegap = $this->phonegap;
-               $this->config->retinaResolution = $this->maxRes;
+               $this->config->retinaResolution = min($this->book->parametres->maxResolution, $this->maxRes);
                $this->config->pageLabels = $this->pageLabels;
                $this->config->pageZoomFactor = $this->z;
                $this->config->multiply = $this->multiply;