(no commit message)

diff --git a/fluidbook/compile/_js/fluidbook.js b/fluidbook/compile/_js/fluidbook.js
index f1e2d81e38295b04ffcb620cdd61ab2f288cb3ce..abeba64b2a70c2c463ebd934859642cbd6bbd310 100644 (file)
--- a/fluidbook/compile/_js/fluidbook.js
+++ b/fluidbook/compile/_js/fluidbook.js
@@ -1,4 +1,10 @@
+var _GET=parseGet();\r
+\r
 function getWmode(){\r
+       if(_GET['wmode']!=undefined){\r
+               return _GET['wmode'];\r
+       }\r
+       \r
        var ua=navigator.userAgent;\r
        if(ua.search(/mac/i)>-1 && ua.search(/opera/i)>-1){\r
                return 'normal';\r
@@ -37,12 +43,10 @@ function parseGet(res){
 }\r
 \r
 function getLang(){\r
-       var get={};\r
-       get=parseGet(get);\r
-       if(get.lang==undefined || get.lang==null || get.lang==''){\r
+       if(_GET.lang==undefined || _GET.lang==null || _GET.lang==''){\r
                return FB_DEFAULT_LANG;\r
        }\r
-       return get.lang;\r
+       return _GET.lang;\r
 }\r
 \r
 function mailto(adresse){\r
@@ -61,7 +65,11 @@ function popupFS(page){
        if(page==undefined){\r
                page=0;\r
        }\r
-       window.open('index.html#/'+page, 'fbpopupfs', 'width='+screen.width+',height='+screen.height+',resizable=yes');\r
+       window.open('index.html#/'+page, 'fbpopupfs_'+rand(1000,9999), 'width='+screen.width+',height='+screen.height+',resizable=yes');\r
+}\r
+\r
+function rand(min,max){\r
+       return Math.round(min+(Math.rand()*(max-min)));\r
 }\r
 \r
 function getCookieVal(offset)\r

diff --git a/fluidbook/icones/5/nav-2d.png b/fluidbook/icones/5/nav-2d.png
index a8ba6d73bd64adcbd5cc699ac66e723c3abe09bc..14fb9f90f80a7c51f45b08b5529a8a67f0c104d5 100644 (file)
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 03fe202aafebadade0156fff81ca479f4c652ef4..327e9bbbaa3d0f3639195f639259999628e2b573 100644 (file)
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 0206770a91698a20b24a3b09d67800ebdcc5260f..568aeb681cf8f65ffe1847b0f2ec5f7ac8b65b83 100644 (file)
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 4edf28d6c5ded5d71a52d58091d12da30757ea73..12213be8633cc2541a6ee739a77a52a7dee08aa5 100644 (file)
--- 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();\r
                }\r
 \r
-               if (isset($_POST['valide'])) {\r
+               if (isset($_POST['valide']) && $book->status<1) {\r
                        $book = $dao->setStatus($book_id, 1);\r
                }\r
 \r