(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 780b0c8dc4fb0c71f80073cc54e714624c60204e..c8d0f94b10fa70ad3edcb5ed27e1704e532bacdb 100644 (file)
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -147,7 +147,9 @@ class wsServices extends cubeFlashGateway {
 \r
                $hits = $index->find($query);\r
                $res = array();\r
+               $terms = array();\r
                foreach ($query->getQueryTerms() as $t) {\r
+                       $terms[] = $t->text;\r
                        foreach ($index->termFreqs($t) as $doc_id => $f) {\r
                                $page = trim($index->getDocument($doc_id)->getField('url')->getUtf8Value(), "#");\r
                                if (!isset($res[$page])) {\r
@@ -157,6 +159,7 @@ class wsServices extends cubeFlashGateway {
                        }\r
                }\r
                $this->xml->addChild('results', json_encode($res));\r
+               $this->xml->addChild('terms', implode(',', $terms));\r
        }\r
 \r
        protected function getTerms($term) {\r

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 67132ef8a3a737a288b1dbd2df591631afce98ac..a6cdfed8669c700281eb88f645a40df1063139c0 100644 (file)
--- 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;\r
                // Set the icon list with the color\r
                $icons = array('nav-bookmark' => $couleurI, 'nav-friend' => $couleurI, 'nav-help' => $couleurI, 'nav-index' => $couleurI, 'nav-sommaire' => $couleurI,\r
-                       'next' => $arrowsColor, 'previous' => $arrowsColor, 'search' => $couleurI,'nav-facebook'=>$couleurI,'nav-twitter'=>$couleurI);\r
+                       'next' => $arrowsColor, 'previous' => $arrowsColor, 'search' => $couleurI, 'nav-facebook' => $couleurI, 'nav-twitter' => $couleurI);\r
 \r
                foreach ($icons as $icon => $color) {\r
                        wsTools::colorizeAndRasterizeIcon($this->theme->parametres->iconSet, $icon, $color, $this->vdir . '/data/images/', 4, $w, $h);\r
@@ -376,6 +376,8 @@ class wsPackagerHTML5 extends wsPackager {
                $thumbh = round(100 / $ratio);\r
                $res[] = '#index .thumb img{width:100px;height:' . $thumbh . 'px;}';\r
                $res[] = '#index .doubleThumb{height:' . $thumbh . 'px;' . $this->writeCSSUA('box-shadow', '0 0 3px ' . $shadowColor) . '}';\r
+               $res[] = '#index .doubleThumb .overlay{height:' . $thumbh . 'px;}';\r
+               $res[] = '#index .doubleThumb .hits.yes{background-color:' . self::colorToCSS($this->theme->parametres->subSelectColor) . ';color:' . self::colorToCSS($this->theme->parametres->subTextSelectColor) . '}';\r
 \r
                // Pages styles\r
                foreach ($this->cssColor as $color => $index) {\r