From 4129225d75ca8391f8342f01cadb85594e093fe3 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Sat, 16 Jul 2011 03:59:11 +0000 Subject: [PATCH] --- inc/ws/Controlleur/class.ws.services.php | 3 +++ inc/ws/Util/packager/html5/class.ws.packager.html5.php | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php index 780b0c8dc..c8d0f94b1 100644 --- a/inc/ws/Controlleur/class.ws.services.php +++ b/inc/ws/Controlleur/class.ws.services.php @@ -147,7 +147,9 @@ class wsServices extends cubeFlashGateway { $hits = $index->find($query); $res = array(); + $terms = array(); foreach ($query->getQueryTerms() as $t) { + $terms[] = $t->text; foreach ($index->termFreqs($t) as $doc_id => $f) { $page = trim($index->getDocument($doc_id)->getField('url')->getUtf8Value(), "#"); if (!isset($res[$page])) { @@ -157,6 +159,7 @@ class wsServices extends cubeFlashGateway { } } $this->xml->addChild('results', json_encode($res)); + $this->xml->addChild('terms', implode(',', $terms)); } protected function getTerms($term) { diff --git a/inc/ws/Util/packager/html5/class.ws.packager.html5.php b/inc/ws/Util/packager/html5/class.ws.packager.html5.php index 67132ef8a..a6cdfed86 100644 --- a/inc/ws/Util/packager/html5/class.ws.packager.html5.php +++ b/inc/ws/Util/packager/html5/class.ws.packager.html5.php @@ -132,7 +132,7 @@ class wsPackagerHTML5 extends wsPackager { $arrowsColor = '#' . $this->theme->parametres->arrowsColor; // Set the icon list with the color $icons = array('nav-bookmark' => $couleurI, 'nav-friend' => $couleurI, 'nav-help' => $couleurI, 'nav-index' => $couleurI, 'nav-sommaire' => $couleurI, - 'next' => $arrowsColor, 'previous' => $arrowsColor, 'search' => $couleurI,'nav-facebook'=>$couleurI,'nav-twitter'=>$couleurI); + 'next' => $arrowsColor, 'previous' => $arrowsColor, 'search' => $couleurI, 'nav-facebook' => $couleurI, 'nav-twitter' => $couleurI); foreach ($icons as $icon => $color) { wsTools::colorizeAndRasterizeIcon($this->theme->parametres->iconSet, $icon, $color, $this->vdir . '/data/images/', 4, $w, $h); @@ -376,6 +376,8 @@ class wsPackagerHTML5 extends wsPackager { $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) . '}'; // Pages styles foreach ($this->cssColor as $color => $index) { -- 2.39.5