(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 442e3c1ddc126e7d39960d44b92a07badd92a355..04d9bbaef7205e8d852a3fafd57b87c34251f1fd 100644 (file)
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -724,7 +724,7 @@ class wsServices extends cubeFlashGateway {
 \r
        protected function _getRegExpManifest($r, $book, $theme, $resolution) {\r
                $reg = array();\r
-               $reg['loading'] = array('^' . $r . 'style/(.*).css$', '^' . $r . 'index.html$', '^' . $r . 'data/style/(.*)$', '^' . $r . 'data/(.*).js$', '^' . $r . 'data/images/' . $theme->parametres->logoLoader . '$', '^' . $r . 'style/fonts/(.*).ttf$');\r
+               $reg['loading'] = array('^' . $r . 'style/(.*).css$', '^' . $r . 'index.html$', '^' . $r . 'data/style/(.*)$', '^' . $r . 'data/(.*).js$', '^' . $r . 'data/images/' . $theme->parametres->logoLoader . '$', '^' . $r . 'style/fonts/(.*).ttf$','^' . $r . 'data/images/interface-down.svg$');\r
                $reg['extras'] = array('^' . $r . 'data/links/(.*)$', '^' . $r . 'data/(.*).pdf$', '^' . $r . 'cover.jpg$');\r
                $reg['thumbnails'] = array('^' . $r . 'data/thumbnails/p(\d+).jpg$');\r
                for ($i = 1; $i <= $book->parametres->pages; $i++) {\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index ffa5bbd0390f3b67093bfbb655e844a7609b593d..223ec0ca5fba29d67a942f869ef4f9fc09842454 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -88,8 +88,6 @@ class wsUrl {
                $res .= '</tr>';\r
                $i = 0;\r
 \r
-\r
-\r
                $btVoir = '<div></div><span>' . __('voir') . '</span>';\r
                $btEdit = '<div></div><span>' . __('éditer') . '</span>';\r
                $btStats = '<div></div><span>' . __('stats') . '</span>';\r

diff --git a/inc/ws/Util/html5/app/class.ws.html5.app.compiler.php b/inc/ws/Util/html5/app/class.ws.html5.app.compiler.php
index 6139340a643f058e9f4d2b654f7e49a22989d59e..80460861c71ba7c301469ce3fba51a01ebb082af 100644 (file)
--- a/inc/ws/Util/html5/app/class.ws.html5.app.compiler.php
+++ b/inc/ws/Util/html5/app/class.ws.html5.app.compiler.php
@@ -181,11 +181,12 @@ class wsHTML5AppCompiler {
        color:$text;
 }";
 
+
                $svg = array('interface-back-arrow');
                foreach ($svg as $icon) {
                        wsTools::colorizeAndRasterizeIcon(1, $icon, $text, $this->vdir . '/images/', 4, $w, $h, true);
                }
-               $textColor->toCSS();
+
 
                $caption.="#bar{border-bottom:1px solid " . $border . "}";
                $c[] = $caption;
@@ -207,6 +208,7 @@ class wsHTML5AppCompiler {
 }";
 
                $c[] = '.mview li a{color:' . $text . ';}';
+               $c[] = '.mview .content a{text-decoration:undeline;color:' . $text . ';}';
                file_put_contents($this->vdir . '/data/app.css', implode("\n", $c));
        }