From: vincent@cubedesigners.com Date: Wed, 12 Oct 2011 22:50:40 +0000 (+0000) Subject: (no commit message) X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=6b2110302d5c158d817d037e8c9f1d3506616ef8;p=cubeextranet.git --- diff --git "a/_project/Pr\303\251sentation_fluidbook_html5.pptx" "b/_project/Pr\303\251sentation_fluidbook_html5.pptx" index 03bde2f0c..3d766f1c9 100644 Binary files "a/_project/Pr\303\251sentation_fluidbook_html5.pptx" and "b/_project/Pr\303\251sentation_fluidbook_html5.pptx" differ diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php index 58436a52d..2237c8e29 100644 --- a/inc/ws/Util/html5/class.ws.html5.compiler.php +++ b/inc/ws/Util/html5/class.ws.html5.compiler.php @@ -130,13 +130,9 @@ class wsHTML5Compiler { } $this->numerotation = explode(',', $this->book->numerotation); } - - public function getCssScale(){ - if($this->book->parametres->zoomMode==1){ - return $this->cssOneScale; - }else{ - return $this->cssScale; - } + + public function getCssScale() { + return $this->cssScale; } public function virtualToPhysical($virtual) { @@ -553,23 +549,14 @@ class wsHTML5Compiler { $res = array(); // General theme + $cssWidth = $this->cssWidth; + $cssHeight = $this->cssHeight; + $cssScale = $this->cssScale; + $w2 = ($cssWidth * 2) . 'px'; - if ($this->book->parametres->zoomMode == '1') { - // Slideshow mode - $cssScale = $this->cssOneScale; - $cssWidth = $this->cssOneWidth; - $cssHeight = $this->cssOneHeight; - $w2 = ($cssWidth * 2) . 'px'; - } else { - // Normal mode - $cssWidth = $this->cssWidth; - $cssHeight = $this->cssHeight; - $cssScale = $this->cssScale; - $w2 = ($cssWidth * 2) . 'px'; - } $h = $cssHeight . 'px'; - + $wm = ($this->width * $this->multiply) . 'px'; $hm = ($this->height * $this->multiply) . 'px'; $w = $cssWidth . 'px';