wip #768 @0.5

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index e803b072a6720f6e43c49b9134dccf4fb4a894e8..f8b3a3a4ce29c2636237e7627d0ce90bf08104fa 100644 (file)
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -743,7 +743,7 @@ class wsServices extends cubeFlashGateway {
 
                $r = $core->con->select('SELECT url FROM flfref WHERE ref="' . $core->con->escape($this->args['ref']) . '"');
                if ($r->count()) {
-                       header('Location: http://www.flf.fr' . $r->url . '?tkpub=ecatalogue-general-2017');
+                       header('Location: http://www.flf.fr' . $r->url . '?tkpub=ecata-general&tkcmpg=2017');
                        exit;
                }
                $q = 'site:http://www.flf.fr/formation-professionnelle/ "Code stage : ' . $this->args['ref'] . '"';

diff --git a/inc/ws/Util/html5/class.ws.html5.links.php b/inc/ws/Util/html5/class.ws.html5.links.php
index 5beea33366e773b6eedf464f2d12e7b4f562392d..e4523f37e0601a4b9bf4caddd35f7bcc70b7064c 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/class.ws.html5.links.php
@@ -183,7 +183,11 @@ class wsHTML5Link {
        }
 
        public function getHTMLContainerClass() {
-               return 'link';
+               $res = 'link';
+               if ($this->page % 2 == 1) {
+                       $res .= ' odd';
+               }
+               return $res;
        }
 
        public function getHTMLContent() {
@@ -331,7 +335,7 @@ class tooltipLink extends normalLink {
 class htmlMultimediaImage extends wsHTML5Link {
 
        public function getHTMLContainerClass() {
-               return 'link multimedia';
+               return parent::getHTMLContainerClass() . ' multimedia';
        }
 
        public function getHTMLContent() {
@@ -381,7 +385,7 @@ class htmlMultimediaPopupImage extends normalLink {
 class contentLink extends wsHTML5Link {
 
        public function getHTMLContainerClass() {
-               return 'link contentLink';
+               return parent::getHTMLContainerClass() . ' contentLink';
        }
 
 }
@@ -740,7 +744,7 @@ class htmlMultimediaLink extends wsHTML5Link {
        }
 
        public function getHTMLContainerClass() {
-               $res = 'link multimedia';
+               $res = parent::getHTMLContainerClass() . ' multimedia';
                if (!$this->interactive) {
                        $res .= ' notinteractive';
                }