From f9cf6895a861f20cd1fcd64e7fa4feffe8e80279 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Wed, 18 Jul 2012 16:07:04 +0000 Subject: [PATCH] --- inc/ws/Util/html5/class.ws.html5.compiler.php | 14 ++++++++++++-- inc/ws/Util/html5/class.ws.html5.links.php | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php index df634e2d5..5276feed1 100644 --- a/inc/ws/Util/html5/class.ws.html5.compiler.php +++ b/inc/ws/Util/html5/class.ws.html5.compiler.php @@ -234,6 +234,7 @@ class wsHTML5Compiler { $this->writeIndex($numCSS); $this->writeJs(); $this->writeTexts(); + $this->writeExtras(); $this->writeCache(); } @@ -442,11 +443,17 @@ class wsHTML5Compiler { } } + protected function writeExtras(){ + if($this->theme->parametres->afterSearch!=''){ + copy($this->themeRoot . '/' . $this->theme->parametres->afterSearch, $this->vdir . '/data/images/' . $this->theme->parametres->afterSearch); + } + } + protected function writeLinks() { global $core; $daoDoc = new wsDAODocument($core->con); $daoDoc->getLinksAndRulers($this->book_id, $links, $rulers); - + $i = 0; $pages = array(); $css = array(); @@ -462,10 +469,13 @@ class wsHTML5Compiler { $css[] = $link->getCSSContainer(); $i++; } + + $allpages=range(0,$this->book->parametres->pages+1); + $allpages[]='aftersearch'; $this->config->links = array(); - for ($i = 0; $i <= $this->book->parametres->pages + 1; $i++) { + foreach ($allpages as $i) { $c = ''; if (isset($pages[$i])) { $c = $pages[$i]; diff --git a/inc/ws/Util/html5/class.ws.html5.links.php b/inc/ws/Util/html5/class.ws.html5.links.php index bef5f7780..0dd717ac6 100644 --- a/inc/ws/Util/html5/class.ws.html5.links.php +++ b/inc/ws/Util/html5/class.ws.html5.links.php @@ -289,7 +289,7 @@ class webVideoLink extends videoLink { class actionLink extends internalLink { public function getURL() { - return '#' . $to; + return '#/' . $this->to; } } -- 2.39.5