(no commit message)

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 76d27677fd0443c4555a1eec61d928158de74b4a..1ebc70dc49bf116378d772f4d186224dfdeac3f1 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -13,6 +13,8 @@ class wsHTML5Compiler {
        protected static $resolutions = array(150, 36);
        protected static $uaPrefixes = array('-moz-', '-webkit-', '-o-', '-ms-', '');
        protected static $jsFiles = array(
+               'js/libs/fix/ios-orientation.js',
+               'js/libs/fix/detect-zoom.js',
                'js/libs/cube/fb.js',
                'js/libs/modernizr.js',
                'js/libs/flashdetect.js',
@@ -32,6 +34,8 @@ class wsHTML5Compiler {
                'js/libs/fluidbook/fluidbook.loader.js',
                'js/libs/fluidbook/fluidbook.search.js',
                'js/libs/fluidbook/fluidbook.chapters.js',
+               'js/libs/fluidbook/fluidbook.help.js',
+               'js/libs/fluidbook/fluidbook.resize.js',
                'js/libs/fluidbook/fluidbook.js',
                'js/main.js');
        protected static $debugJsFiles = array(
@@ -928,6 +932,11 @@ class wsHTML5CompilerDev extends wsHTML5Compiler {
                $res[] = $texts;
 
                // Theme
+               $shade = '.page .shade{';
+               $shade.='opacity:' . ($this->theme->parametres->shadeAlpha / 100) . ';';
+               $shade.='}';
+               $res[] = $shade;
+
                // Background
                $body = '#main{';
                $body.='background-color:#' . $this->theme->parametres->backgroundColor . ';';
@@ -982,7 +991,7 @@ class wsHTML5CompilerDev extends wsHTML5Compiler {
                $res[] = $body;
 
                // Header
-               $header = '#header{';
+               $header = 'header{';
                $header.='height:' . $this->theme->parametres->menuHeight . 'px;';
                $header.='background-color:' . self::colorToCSS($this->theme->parametres->menuColor) . ';';
                if ($this->theme->parametres->menuImage != '') {
@@ -1008,7 +1017,7 @@ class wsHTML5CompilerDev extends wsHTML5Compiler {
                $res[] = $logo;
 
                // Credits
-               $res[] = '#credits,#credits a{color:' . self::colorToCSS($this->theme->parametres->creditsColor) . ';}';
+               $res[] = 'footer,footer a{color:' . self::colorToCSS($this->theme->parametres->creditsColor) . ';}';
 
                // Arrows
                $res[] = '#next,#previous{background-color:' . self::colorToCSS($this->theme->parametres->couleurA) . ';}';
@@ -1031,10 +1040,10 @@ class wsHTML5CompilerDev extends wsHTML5Compiler {
                # Index
                $ratio = $this->width / $this->height;
                $thumbh = round(100 / $ratio);
-               $res[] = '#index .thumb img{width:100px;height:' . $thumbh . 'px;}';
-               $res[] = '#index .doubleThumb{height:' . $thumbh . 'px;' . $this->writeCSSUA('box-shadow', '0 0 3px ' . $shadowColor) . '}';
-               $res[] = '#index .doubleThumb .overlay{height:' . $thumbh . 'px;}';
-               $res[] = '#index .doubleThumb .hits.yes{background-color:' . self::colorToCSS($this->theme->parametres->subSelectColor) . ';color:' . self::colorToCSS($this->theme->parametres->subTextSelectColor) . '}';
+               $res[] = '#indexView .thumb img{width:100px;height:' . $thumbh . 'px;}';
+               $res[] = '#indexView .doubleThumb{height:' . $thumbh . 'px;' . $this->writeCSSUA('box-shadow', '0 0 3px ' . $shadowColor) . '}';
+               $res[] = '#indexView .doubleThumb .overlay{height:' . $thumbh . 'px;}';
+               $res[] = '#indexView .doubleThumb .hits.yes{background-color:' . self::colorToCSS($this->theme->parametres->subSelectColor) . ';color:' . self::colorToCSS($this->theme->parametres->subTextSelectColor) . '}';
 
                $res = array_chunk($res, 3500);
                foreach ($res as $k => $css) {