From 4962f42ab68e3cf79f8bd6ab84cda9c1111e07b2 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Tue, 3 Sep 2013 12:27:10 +0000 Subject: [PATCH] --- inc/ws/Controlleur/class.ws.services.php | 2 +- inc/ws/Controlleur/class.ws.url.php | 2 -- inc/ws/Util/html5/app/class.ws.html5.app.compiler.php | 4 +++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php index 442e3c1dd..04d9bbaef 100644 --- a/inc/ws/Controlleur/class.ws.services.php +++ b/inc/ws/Controlleur/class.ws.services.php @@ -724,7 +724,7 @@ class wsServices extends cubeFlashGateway { protected function _getRegExpManifest($r, $book, $theme, $resolution) { $reg = array(); - $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$'); + $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$'); $reg['extras'] = array('^' . $r . 'data/links/(.*)$', '^' . $r . 'data/(.*).pdf$', '^' . $r . 'cover.jpg$'); $reg['thumbnails'] = array('^' . $r . 'data/thumbnails/p(\d+).jpg$'); for ($i = 1; $i <= $book->parametres->pages; $i++) { diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php index ffa5bbd03..223ec0ca5 100644 --- a/inc/ws/Controlleur/class.ws.url.php +++ b/inc/ws/Controlleur/class.ws.url.php @@ -88,8 +88,6 @@ class wsUrl { $res .= ''; $i = 0; - - $btVoir = '
' . __('voir') . ''; $btEdit = '
' . __('éditer') . ''; $btStats = '
' . __('stats') . ''; 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 6139340a6..80460861c 100644 --- 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)); } -- 2.39.5