From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 4 Oct 2016 10:14:15 +0000 (+0000)
Subject: wip #768 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=9cc3feb31a844bbff48c436f40b58491a0a82c7c;p=cubeextranet.git

wip #768 @0.5
---

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index e803b072a..f8b3a3a4c 100644
--- 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 5beea3336..e4523f37e 100644
--- 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';
 		}