From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 22 May 2012 14:01:56 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=e88f4def3b8190d35056a788f90c0dc92644f251;p=cubeextranet.git

---

diff --git a/fluidbook/compile/_js/fluidbook.js b/fluidbook/compile/_js/fluidbook.js
index f1e2d81e3..abeba64b2 100644
--- a/fluidbook/compile/_js/fluidbook.js
+++ b/fluidbook/compile/_js/fluidbook.js
@@ -1,4 +1,10 @@
+var _GET=parseGet();
+
 function getWmode(){
+	if(_GET['wmode']!=undefined){
+		return _GET['wmode'];
+	}
+	
 	var ua=navigator.userAgent;
 	if(ua.search(/mac/i)>-1 && ua.search(/opera/i)>-1){
 		return 'normal';
@@ -37,12 +43,10 @@ function parseGet(res){
 }
 
 function getLang(){
-	var get={};
-	get=parseGet(get);
-	if(get.lang==undefined || get.lang==null || get.lang==''){
+	if(_GET.lang==undefined || _GET.lang==null || _GET.lang==''){
 		return FB_DEFAULT_LANG;
 	}
-	return get.lang;
+	return _GET.lang;
 }
 
 function mailto(adresse){
@@ -61,7 +65,11 @@ function popupFS(page){
 	if(page==undefined){
 		page=0;
 	}
-	window.open('index.html#/'+page, 'fbpopupfs', 'width='+screen.width+',height='+screen.height+',resizable=yes');
+	window.open('index.html#/'+page, 'fbpopupfs_'+rand(1000,9999), 'width='+screen.width+',height='+screen.height+',resizable=yes');
+}
+
+function rand(min,max){
+	return Math.round(min+(Math.rand()*(max-min)));
 }
 
 function getCookieVal(offset)
diff --git a/fluidbook/icones/5/nav-2d.png b/fluidbook/icones/5/nav-2d.png
index a8ba6d73b..14fb9f90f 100644
Binary files a/fluidbook/icones/5/nav-2d.png and b/fluidbook/icones/5/nav-2d.png differ
diff --git a/fluidbook/icones/5/nav-normal.png b/fluidbook/icones/5/nav-normal.png
index 03fe202aa..327e9bbba 100644
Binary files a/fluidbook/icones/5/nav-normal.png and b/fluidbook/icones/5/nav-normal.png differ
diff --git a/fluidbook/icones/5/nav-normalscreen.png b/fluidbook/icones/5/nav-normalscreen.png
index 0206770a9..568aeb681 100644
Binary files a/fluidbook/icones/5/nav-normalscreen.png and b/fluidbook/icones/5/nav-normalscreen.png differ
diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index 4edf28d6c..12213be86 100644
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -202,7 +202,7 @@ class wsAjax extends cubeAjax {
 			commonDroits::error();
 		}
 
-		if (isset($_POST['valide'])) {
+		if (isset($_POST['valide']) && $book->status<1) {
 			$book = $dao->setStatus($book_id, 1);
 		}