#1532

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 1c5cf2d5b743f43dde2acc60e13c6169deabe29f..919767aa60756f3cc57d5a5bcd500ae907f89b40 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -353,6 +353,9 @@ class wsBookParametres extends wsParametres {
                                                                               __('Normal (une page)') => 'portrait',
                                                                               __('Magazine tablette') => 'tab')
                );
+               $this->fields['rasterizePages'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Ecraser les pages'), 'hint' => '1-3,5 = 1,2,3,5', 'grade' => 1);
+
+
                $this->fields['mobileTransitionDuration'] = array('type' => 'float', 'default' => '1.0', 'editable' => true, 'label' => __('Durée de la transition'));
                $this->fields['mobileLinksRevealAnim'] = array('type' => 'boolean', 'default' => 'false', 'editable' => true, 'label' => __("Animer les liens après un changement de page"), 'grade' => 3);
 
@@ -368,7 +371,7 @@ class wsBookParametres extends wsParametres {
                $this->fields['mobileIgnoreBackgroundLinks'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Ignorer les liens de background'));
 
                $this->forms['mobile'] = array('label' => __('Version mobile'),
-                                              'fieldsnames' => array('alwaysHTML5', 'html5priority', 'mobileNavigationType', '|', 'mobileNavScale', '|', 'mobileTransitions', 'mobileTransitionDuration', "mobileLinksRevealAnim", '|', 'navOrderH', '|', 'mobileIconVector', 'mobileServerConfig', 'mobilePlugins', '|', 'mobileVideosPath', '|', 'mobileExtraXSpace', '|', 'mobileIgnoreBackgroundLinks'));
+                                              'fieldsnames' => array('alwaysHTML5', 'html5priority', 'mobileNavigationType', '|', 'rasterizePages', '|', 'mobileNavScale', '|', 'mobileTransitions', 'mobileTransitionDuration', "mobileLinksRevealAnim", '|', 'navOrderH', '|', 'mobileIconVector', 'mobileServerConfig', 'mobilePlugins', '|', 'mobileVideosPath', '|', 'mobileExtraXSpace', '|', 'mobileIgnoreBackgroundLinks'));
 
 
                $this->fields['phonegapId'] = array('type' => 'text', 'default' => 'com.fluidbook.phonegap.$id', 'editable' => true, 'label' => __("Identifiant de l'identifiant"), 'grade' => 5, 'hint' => __('De la forme') . ' com.fluidbook.phonegap.xxxxx');

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 1faa83c93a6614b456551250a8a47146b709e000..732c7bf909209cc247c410efe6de642a807adadb 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -1049,6 +1049,7 @@ class wsHTML5Compiler {
                                }
                        }
                }
+               $this->config->rasterizePages = cubeArray::parseRange($this->config->rasterizePages);
 
                return 'var DATAS=' . json_encode($this->config) . ';' . "\n";
        }
@@ -1124,11 +1125,11 @@ class wsHTML5Compiler {
                                                $srcPrefix = 'h';
                                        }
                                        $ok = $this->copy($docdir . 'html/' . $srcPrefix . $r . '-' . $infos['document_page'] . '.jpg', $this->vdir . '/data/background/' . $r . '/' . $backgroundsPrefix . $page . '.jpg');
-                               if (!$ok && $r = 300) {
-                                       $this->maxRes = 150;
-                               }
+                                       if (!$ok && $r = 300) {
+                                               $this->maxRes = 150;
+                                       }
                                }
-                       $this->copy(WS_DOCS . '/' . $infos['document_id'] . '/p' . $infos['document_page'] . '.jpg', $this->vdir . '/data/thumbnails/p' . $page . '.jpg');
+                               $this->copy(WS_DOCS . '/' . $infos['document_id'] . '/p' . $infos['document_page'] . '.jpg', $this->vdir . '/data/thumbnails/p' . $page . '.jpg');
                        }
 
                        $thumb = false;
@@ -1372,7 +1373,7 @@ class wsHTML5Compiler {
                        $res[] = '#shadow>div{' . wsHTML5::writeCSSUA('box-shadow', '0 0 20px ' . $shadowColor) . '}';
                }
 
-               $lessVariables['links-color']=wsHTML5::colorToCSS($this->theme->parametres->linksColor);
+               $lessVariables['links-color'] = wsHTML5::colorToCSS($this->theme->parametres->linksColor);
 
                // Links Styles
                $res = array_merge($res, $links);