From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 18 Jun 2018 16:22:37 +0000 (+0000)
Subject: done #2034 @1.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=81c7087dc596eb6ed3f734668e129a7f9038f0d8;p=cubeextranet.git

done #2034 @1.5
---

diff --git a/composer.json b/composer.json
index 024757558..6abd43841 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,6 @@
 {
   "require": {
+    "php": ">=7.2",
     "php-mime-mail-parser/php-mime-mail-parser": "2.11.1"
   }
 }
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 8dbef6cec..121a7b341 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -1,8 +1,10 @@
 <?php
 
-class wsUrl {
+class wsUrl
+{
 
-	public static function publications($args) {
+	public static function publications($args)
+	{
 		global $core;
 
 		if (isset($args[1])) {
@@ -35,7 +37,8 @@ class wsUrl {
 		return $res;
 	}
 
-	public static function listeBooks($dashboard = null, $settings = null) {
+	public static function listeBooks($dashboard = null, $settings = null)
+	{
 		global $core;
 		cubePage::truePopup();
 		cubePage::autocomplete();
@@ -59,7 +62,7 @@ class wsUrl {
 
 		$res = '';
 
-		$res .= self::contextBookDownload($context_download_id, $droits);
+
 		$res .= self::contextBookStatus($context_status_id);
 		$res .= self::contextBookView($context_view_id);
 
@@ -141,7 +144,8 @@ class wsUrl {
 				if ($droits->admin) {
 					$res .= '<td class="bouton"><a href="#" rel="exportbook/' . $book->book_id . '" class="popup download btbook">' . $btDownload . '</a></td>';
 				} else {
-					$res .= '<td class="bouton"><a href="#" class="openContextMenu download btbook" rel="' . $context_download_id . '" rev="' . $book->book_id . '">' . $btDownload . '</a></td>';
+					$res .= self::contextBookDownload($context_download_id, $droits, $book);
+					$res .= '<td class="bouton"><a href="#" class="openContextMenu download btbook" rel="' . $context_download_id . '_' . $book->book_id . '" rev="' . $book->book_id . '">' . $btDownload . '</a></td>';
 				}
 			} else {
 				$res .= '<td></td>';
@@ -166,7 +170,8 @@ class wsUrl {
 		return $res;
 	}
 
-	public static function collections() {
+	public static function collections()
+	{
 		global $core;
 
 		if (isset($args[1])) {
@@ -192,7 +197,8 @@ class wsUrl {
 		return $res;
 	}
 
-	public static function collection($args) {
+	public static function collection($args)
+	{
 		global $core;
 		commonDroits::min(1);
 		cubePage::ui('Sortable');
@@ -214,7 +220,8 @@ class wsUrl {
 		return $res;
 	}
 
-	public static function collectionEdit($collection) {
+	public static function collectionEdit($collection)
+	{
 		global $core;
 
 		$res = '<h1>Gestion de la collection &laquo; ' . $collection->nom . ' &raquo; <em># ' . $collection->collection_id . '</em></h1>';
@@ -390,14 +397,16 @@ class wsUrl {
 		return $res;
 	}
 
-	public static function viewCollectionFile($file, $collection_id) {
+	public static function viewCollectionFile($file, $collection_id)
+	{
 		$res = '<a href="/fluidbook/collections/working/' . $collection_id . '/' . $file . '" target="_blank">';
 		$res .= cubeMedia::tango('actions/document-save.png');
 		$res .= '</a>';
 		return $res;
 	}
 
-	public static function getSelectVersions($versions) {
+	public static function getSelectVersions($versions)
+	{
 		fb($versions);
 		$res = array('-----' => '');
 		$e = explode(',', $versions);
@@ -409,7 +418,8 @@ class wsUrl {
 		return $res;
 	}
 
-	public static function listeCollections($dashboard = null, $settings = null) {
+	public static function listeCollections($dashboard = null, $settings = null)
+	{
 		global $core;
 
 		cubePage::truePopup();
@@ -478,7 +488,8 @@ class wsUrl {
 		return $res;
 	}
 
-	public static function getFluidbookVersions($select = false) {
+	public static function getFluidbookVersions($select = false)
+	{
 		$droits = wsDroits::getDroits();
 
 		$chooseVersion = wsDroits::admin();
@@ -531,16 +542,33 @@ class wsUrl {
 		return $res;
 	}
 
-	public static function contextBookDownload($id, $droits) {
+	public static function contextBookDownload($id, $droits, $book = null)
+	{
 		global $core;
 
 		$versions = self::getFluidbookVersions();
 
+		if (null !== $book) {
+			$id .= '_' . $book->book_id;
+		}
+
 		$res = '<div class="contextMenu downbookContextMenu" id="' . $id . '">';
 		$res .= '<ul>';
 		$res .= '<li class="head">' . __("Sélectionnez une version") . '</li>';
 		foreach ($versions as $k => $v) {
-			$res .= '<li><a href="#" rel="downbook/$1/' . $k . '" class="ajax">' . $v['icon'] . $v['title'] . '</a></li>';
+			$disabled = '';
+			if (null !== $book) {
+				$tk = 'download_' . $k;
+				if (!$book->parametres->{$tk}) {
+					if ($core->user->rs == 'Kadreo') {
+						$disabled = ' class="disabled"';
+					} else {
+						continue;
+					}
+
+				}
+			}
+			$res .= '<li' . $disabled . '><a href="#" rel="downbook/$1/' . $k . '" class="ajax">' . $v['icon'] . $v['title'] . '</a></li>';
 		}
 		if ($droits->admin) {
 			$res .= '<li class="head">' . __("Installer sur ...") . '</li>';
@@ -559,7 +587,8 @@ class wsUrl {
 		return $res;
 	}
 
-	public static function contextBookStatus($id) {
+	public static function contextBookStatus($id)
+	{
 		global $core;
 
 		if (wsDroits::admin()) {
@@ -581,20 +610,21 @@ class wsUrl {
 		return $res;
 	}
 
-	public static function contextBookView($id) {
+	public static function contextBookView($id)
+	{
 		global $core;
 
 		if (wsDroits::admin()) {
 			$viewers = array(array('version' => 'viewer', 'title' => __('Version Flash'), 'icon' => cubeMedia::image(IMG . '/flash.png')),
-			                 array('version' => 'viewerh', 'title' => __('Version HTML5'), 'icon' => cubeMedia::image(IMG . '/html5.png')),
-			                 array('version' => 'vieweru', 'title' => __('Version Flash') . ' (' . __('debuggage') . ')', 'icon' => cubeMedia::image(IMG . '/flashbug.png')),
-			                 array('version' => 'viewerhu', 'title' => __('Version HTML5') . ' (' . __('debuggage') . ')', 'icon' => cubeMedia::image(IMG . '/html5bug.png')),
-			                 //array('version' => 'viewerhu', 'title' => __('Widget HTML5'), 'icon' => cubeMedia::image(IMG . '/html5bug.png'), 'file' => 'widget.html', 'pattern' => '$1_$2_$3'),
-			                 array('version' => 'viewer1', 'title' => __('Version 1'), 'icon' => cubeMedia::image(IMG . '/flash.png'))
+				array('version' => 'viewerh', 'title' => __('Version HTML5'), 'icon' => cubeMedia::image(IMG . '/html5.png')),
+				array('version' => 'vieweru', 'title' => __('Version Flash') . ' (' . __('debuggage') . ')', 'icon' => cubeMedia::image(IMG . '/flashbug.png')),
+				array('version' => 'viewerhu', 'title' => __('Version HTML5') . ' (' . __('debuggage') . ')', 'icon' => cubeMedia::image(IMG . '/html5bug.png')),
+				//array('version' => 'viewerhu', 'title' => __('Widget HTML5'), 'icon' => cubeMedia::image(IMG . '/html5bug.png'), 'file' => 'widget.html', 'pattern' => '$1_$2_$3'),
+				array('version' => 'viewer1', 'title' => __('Version 1'), 'icon' => cubeMedia::image(IMG . '/flash.png'))
 			);
 		} else {
 			$viewers = array(array('version' => 'viewer', 'title' => __('Version Flash'), 'icon' => cubeMedia::image(IMG . '/flash.png')),
-			                 array('version' => 'viewerh', 'title' => __('Version HTML5'), 'icon' => cubeMedia::image(IMG . '/html5.png'))
+				array('version' => 'viewerh', 'title' => __('Version HTML5'), 'icon' => cubeMedia::image(IMG . '/html5.png'))
 			);
 
 		}
@@ -617,7 +647,8 @@ class wsUrl {
 		return $res;
 	}
 
-	public static function traductions($args) {
+	public static function traductions($args)
+	{
 		global $core;
 
 		commonDroits::min(5);
@@ -662,7 +693,8 @@ class wsUrl {
 		return $res;
 	}
 
-	public static function formLang($lang_id) {
+	public static function formLang($lang_id)
+	{
 		commonDroits::min(5);
 		global $core;
 		$dao = new wsDAOLang($core->con);
@@ -694,7 +726,8 @@ class wsUrl {
 		return $res;
 	}
 
-	public static function exportLangAsExcel($args) {
+	public static function exportLangAsExcel($args)
+	{
 		global $core;
 
 		$lang_id = $args[1];
@@ -716,7 +749,8 @@ class wsUrl {
 		exit;
 	}
 
-	public static function exportAllLangsAsExcel($args) {
+	public static function exportAllLangsAsExcel($args)
+	{
 		global $core;
 
 		$xls = new PHPExcel();
@@ -745,7 +779,8 @@ class wsUrl {
 		$writer->save('php://output');
 	}
 
-	public static function exportLangAsSheet($s, $lang_id, $ref_id = 'en') {
+	public static function exportLangAsSheet($s, $lang_id, $ref_id = 'en')
+	{
 		global $core;
 		$dao = new wsDAOLang($core->con);
 
@@ -784,7 +819,8 @@ class wsUrl {
 		return $lang_name;
 	}
 
-	public static function getFonts() {
+	public static function getFonts()
+	{
 		$formats = array('ttf', 'otf', 'TTF', 'OTF');
 
 		$dr = opendir(FONT_PATH);
@@ -798,7 +834,8 @@ class wsUrl {
 		return $fonts;
 	}
 
-	protected static function getCharsets() {
+	protected static function getCharsets()
+	{
 		$sets = cubeFlexFontAsset::getSets();
 		$res = array();
 		foreach ($sets as $k => $v) {
@@ -807,7 +844,8 @@ class wsUrl {
 		return $res;
 	}
 
-	protected static function getNSISLangs() {
+	protected static function getNSISLangs()
+	{
 		$res = array();
 		$dir = WS_FILES . '/nsislangs';
 		$dr = opendir($dir);
@@ -823,7 +861,8 @@ class wsUrl {
 		return $res;
 	}
 
-	public static function editor($args) {
+	public static function editor($args)
+	{
 		commonDroits::min(1);
 
 		global $core;
@@ -862,7 +901,8 @@ html{height:100%}' . "\n";
 	 * @param mixed $args
 	 * @return
 	 */
-	public static function restoreLinks($args) {
+	public static function restoreLinks($args)
+	{
 		commonDroits::min(1);
 
 		global $core;
@@ -940,7 +980,8 @@ html{height:100%}' . "\n";
 		echo $res;
 	}
 
-	public static function exportLinksAsExcel($args) {
+	public static function exportLinksAsExcel($args)
+	{
 		global $core;
 
 		cubePHP::neverStop();
@@ -962,18 +1003,20 @@ html{height:100%}' . "\n";
 		exit;
 	}
 
-	public static function editComposition($book_id, $hash) {
+	public static function editComposition($book_id, $hash)
+	{
 
 		$fv = array(session_name() => session_id(),
-		            'book_id' => $book_id,
-		            'hash' => $hash,
-		            'url' => '/');
+			'book_id' => $book_id,
+			'hash' => $hash,
+			'url' => '/');
 
 		$mtime = filemtime(ROOT . '/swf/composer.swf');
 		return cubeMedia::flash2(WEBROOT . '/swf/composer.swf?junk=' . $mtime, '100%', '100%', $fv, 'composerSwf', 'swfPanel', 10, '#d2d3c7', '', 'false', 'noscale', 'normal', array(), false, true, false);
 	}
 
-	public static function stats($args) {
+	public static function stats($args)
+	{
 		global $core;
 		$bid = (isset($args[1])) ? $args[1] : null;
 
@@ -989,7 +1032,8 @@ html{height:100%}' . "\n";
 		return wsStats::display($bid . '_' . $hash, $annee, $mois);
 	}
 
-	public static function viewerp($args) {
+	public static function viewerp($args)
+	{
 		commonDroits::min(5);
 
 		$args = cubePage::getArgs($args);
@@ -1009,7 +1053,8 @@ html{height:100%}' . "\n";
 		echo self::commonViewer($book_id, $e[1], true);
 	}
 
-	public static function vieweru($args) {
+	public static function vieweru($args)
+	{
 		commonDroits::min(5);
 
 		$args = cubePage::getArgs($args);
@@ -1033,7 +1078,8 @@ html{height:100%}' . "\n";
 		echo self::commonViewer($book_id, $e[1], false, 'default', true);
 	}
 
-	public static function viewerh($args) {
+	public static function viewerh($args)
+	{
 		global $core;
 
 		$args = cubePage::getArgs($args);
@@ -1074,7 +1120,8 @@ html{height:100%}' . "\n";
 		self::commonHTML5Viewer($book_id, $hash);
 	}
 
-	public static function getHTML5CacheTime($book_id) {
+	public static function getHTML5CacheTime($book_id)
+	{
 		$cacheFile = WS_BOOKS . '/html5/' . $book_id . '/cache.appcache';
 		if (file_exists($cacheFile)) {
 			return filemtime($cacheFile);
@@ -1082,7 +1129,8 @@ html{height:100%}' . "\n";
 		return TIME;
 	}
 
-	public static function viewerhu($args) {
+	public static function viewerhu($args)
+	{
 		global $core;
 
 		commonDroits::min(5);
@@ -1106,7 +1154,8 @@ html{height:100%}' . "\n";
 		self::commonHTML5Viewer($book_id, $hash, 'u');
 	}
 
-	public static function viewerha($args) {
+	public static function viewerha($args)
+	{
 		global $core;
 
 
@@ -1131,7 +1180,8 @@ html{height:100%}' . "\n";
 		self::commonHTML5Viewer($book_id, $hash, 'a');
 	}
 
-	public static function viewerht($args) {
+	public static function viewerht($args)
+	{
 		commonDroits::min(5);
 		$args = cubePage::getArgs($args);
 
@@ -1150,7 +1200,8 @@ html{height:100%}' . "\n";
 		self::commonHTML5Viewer($book_id, $hash, 't');
 	}
 
-	public static function commonHTML5Viewer($book_id, $hash, $version = '') {
+	public static function commonHTML5Viewer($book_id, $hash, $version = '')
+	{
 		global $core;
 		self::checkDocumentVersionOfBook($book_id);
 
@@ -1184,7 +1235,8 @@ html{height:100%}' . "\n";
 		exit;
 	}
 
-	public static function viewer1($args) {
+	public static function viewer1($args)
+	{
 		$args = cubePage::getArgs($args);
 
 		$wmode = isset($args[1]) ? $args[1] : '';
@@ -1208,7 +1260,8 @@ html{height:100%}' . "\n";
 		echo self::commonViewer($book_id, $e[1], false, $wmode, $newurl, '1');
 	}
 
-	public static function viewer($args) {
+	public static function viewer($args)
+	{
 		$args = cubePage::getArgs($args);
 
 
@@ -1235,7 +1288,8 @@ html{height:100%}' . "\n";
 		echo self::commonViewer($book_id, $e[1], false, $wmode, $newurl);
 	}
 
-	public static function commonViewer($book_id, $hash, $standalone = false, $wmode = 'default', $fps = false, $version = 2) {
+	public static function commonViewer($book_id, $hash, $standalone = false, $wmode = 'default', $fps = false, $version = 2)
+	{
 		if (!defined('MINIMIZE_JS')) {
 			define('MINIMIZE_JS', false);
 		}
@@ -1362,7 +1416,8 @@ html{height:100%}' . "\n";
 		return $res;
 	}
 
-	public static function logReferer($id) {
+	public static function logReferer($id)
+	{
 
 		if (!isset($_SERVER['HTTP_REFERER']) || !$_SERVER['HTTP_REFERER']) {
 			$r = '';
@@ -1387,14 +1442,16 @@ html{height:100%}' . "\n";
 		}
 	}
 
-	public static function statsxls($args) {
+	public static function statsxls($args)
+	{
 		$bid = (isset($args[1])) ? $args[1] : null;
 		$annee = (isset($args[2])) ? $args[2] : null;
 		$mois = (isset($args[3])) ? $args[3] : null;
 		wsStats::exportXLS($bid, $annee, $mois);
 	}
 
-	public static function chooseExistingBook() {
+	public static function chooseExistingBook()
+	{
 		wsDroits::creation(true);
 		$res = '<tr><td colspan="2"><p style="width:600px;text-align:justify;"><em>a' . __("Si votre nouvelle publication a des paramètres en commun avec une publication existante, veuillez rechercher cette publication afin d'attribuer par défaut à votre nouvelle publication les paramètres de l'existante") . '</em></p></td></tr>';
 		$res .= '<tr><td>' . __('Rechercher une publication') . ' : </td><td>' . form::field('book_nom', 64, 1024) . form::hidden('book', '') . '</td></tr>';
@@ -1404,7 +1461,8 @@ html{height:100%}' . "\n";
 		return $res;
 	}
 
-	public static function changeBookProprietaire($book_id) {
+	public static function changeBookProprietaire($book_id)
+	{
 		global $core;
 		commonDroits::min(3);
 
@@ -1414,7 +1472,8 @@ html{height:100%}' . "\n";
 		return self::_changeProprietaire($book->proprietaire);
 	}
 
-	public static function changeCollectionProprietaire($collection_id) {
+	public static function changeCollectionProprietaire($collection_id)
+	{
 		global $core;
 		commonDroits::min(3);
 
@@ -1424,13 +1483,15 @@ html{height:100%}' . "\n";
 		return self::_changeProprietaire($collection->proprietaire_nom);
 	}
 
-	protected static function _changeProprietaire($proprietaire) {
+	protected static function _changeProprietaire($proprietaire)
+	{
 		$res = '<tr><td>' . __('Propriétaire actuel') . ' : </td><td>' . $proprietaire . '</td></tr>';
 		$res .= '<tr><td>' . __('Rechercher un utilisateur') . ' : </td><td>' . form::field('book_proprietaire', 64, 1024) . form::hidden('proprietaire', '') . '</td></tr>';
 		return $res;
 	}
 
-	public static function chooseBookProject($book_id) {
+	public static function chooseBookProject($book_id)
+	{
 		global $core;
 
 		wsDroits::admin(true);
@@ -1454,7 +1515,8 @@ html{height:100%}' . "\n";
 		return $res;
 	}
 
-	public static function chooseBookTache($book_id, $projet_id) {
+	public static function chooseBookTache($book_id, $projet_id)
+	{
 		global $core;
 		wsDroits::admin(true);
 
@@ -1485,7 +1547,8 @@ html{height:100%}' . "\n";
 		return $res;
 	}
 
-	public static function valideDownload() {
+	public static function valideDownload()
+	{
 		global $core;
 
 		$res = '<tr><td>' . __("Le téléchargement du fluidbook implique qu'il a été testé et définitivement validé.") . '<br />' . __("Si vous le téléchargez, il vous sera facturé selon les conditions stipulées dans votre contrat.") . '</td></tr>';
@@ -1494,7 +1557,8 @@ html{height:100%}' . "\n";
 		return $res;
 	}
 
-	public static function formInstall($book, $server) {
+	public static function formInstall($book, $server)
+	{
 		if ($server == 'references') {
 			$s = __('Espace des références');
 			$dir = $book->dir_references;
@@ -1521,7 +1585,8 @@ html{height:100%}' . "\n";
 		return $res;
 	}
 
-	public static function testAS($args) {
+	public static function testAS($args)
+	{
 		global $core;
 		commonDroits::min(5);
 		if (!isset($args[1])) {
@@ -1538,7 +1603,8 @@ html{height:100%}' . "\n";
 		exit;
 	}
 
-	public static function testAIR($args) {
+	public static function testAIR($args)
+	{
 		global $core;
 		commonDroits::min(5);
 		if (!isset($args[1])) {
@@ -1554,7 +1620,8 @@ html{height:100%}' . "\n";
 		exit;
 	}
 
-	public static function testLinksCSV($args) {
+	public static function testLinksCSV($args)
+	{
 		global $core;
 		commonDroits::min(5);
 
@@ -1564,7 +1631,8 @@ html{height:100%}' . "\n";
 		echo $dao->putLinksFromCSV($args[1]);
 	}
 
-	protected static function checkDocumentVersionOfBook($book_id) {
+	protected static function checkDocumentVersionOfBook($book_id)
+	{
 		global $core;
 		cubePHP::neverStop();
 		$daoBook = new wsDAOBook($core->con);
@@ -1584,13 +1652,15 @@ html{height:100%}' . "\n";
 		$daoBook->setVersion($book_id, 2);
 	}
 
-	public static function testOldLink($args) {
+	public static function testOldLink($args)
+	{
 		global $core;
 		$daoDoc = new wsDAODocument($core->con);
 		$daoDoc->setLinksFromOldFluidbook($args[1]);
 	}
 
-	protected static function updateDocument($document_id) {
+	protected static function updateDocument($document_id)
+	{
 		global $core;
 
 		$dao = new wsDAODocument($core->con);
@@ -1607,7 +1677,8 @@ html{height:100%}' . "\n";
 		$dao->updateFromObject($doc);
 	}
 
-	public static function testFontExtraction($args) {
+	public static function testFontExtraction($args)
+	{
 		$documentId = $args[1];
 
 		header('Content-type: text/plain');
@@ -1620,7 +1691,8 @@ html{height:100%}' . "\n";
 		exit;
 	}
 
-	public static function getParamsHelp($args) {
+	public static function getParamsHelp($args)
+	{
 		commonDroits::min(5);
 		global $core;
 
@@ -1657,7 +1729,8 @@ html{height:100%}' . "\n";
 		return $res;
 	}
 
-	public static function formatHelp($rubriques) {
+	public static function formatHelp($rubriques)
+	{
 		commonDroits::min(5);
 
 		$res = '';
@@ -1678,7 +1751,8 @@ html{height:100%}' . "\n";
 		return $res;
 	}
 
-	public static function clients($args) {
+	public static function clients($args)
+	{
 		global $core;
 		cubePage::truePopup();
 		cubePage::autoComplete();
@@ -1706,7 +1780,8 @@ html{height:100%}' . "\n";
 		return $res;
 	}
 
-	public static function listeClients($dashboard = null, $settings = null) {
+	public static function listeClients($dashboard = null, $settings = null)
+	{
 		global $core;
 		commonDroits::min(3);
 		$settings = is_null($settings) ? $core->user->getSettings('clients_ws') : $settings;
@@ -1787,7 +1862,8 @@ html{height:100%}' . "\n";
 		return $res;
 	}
 
-	public static function formClient($entreprise_id = 'new') {
+	public static function formClient($entreprise_id = 'new')
+	{
 		global $core;
 		commonDroits::min(3);
 		$dao = new commonDAOEntreprise($core->con);
@@ -1858,7 +1934,8 @@ html{height:100%}' . "\n";
 		return $res;
 	}
 
-	public static function listeContacts($entreprise_id) {
+	public static function listeContacts($entreprise_id)
+	{
 		global $core;
 		commonDroits::min(3);
 		$dao = new commonDAOEntreprise($core->con);
@@ -1880,7 +1957,8 @@ html{height:100%}' . "\n";
 		return $res;
 	}
 
-	public static function formCollection($collection_id = 'new') {
+	public static function formCollection($collection_id = 'new')
+	{
 		global $core;
 		commonDroits::min(3);
 		$dao = new wsDAOCollection($core->con);
@@ -1895,7 +1973,8 @@ html{height:100%}' . "\n";
 		return $res;
 	}
 
-	public static function formContact($client_id = 'new', $entreprise_id = null) {
+	public static function formContact($client_id = 'new', $entreprise_id = null)
+	{
 		global $core;
 		commonDroits::min(3);
 
@@ -1930,7 +2009,8 @@ html{height:100%}' . "\n";
 		return $res;
 	}
 
-	public static function demandes() {
+	public static function demandes()
+	{
 		global $core;
 		cubePage::truePopup();
 		cubePage::autoComplete();
@@ -1955,7 +2035,8 @@ html{height:100%}' . "\n";
 		return $res;
 	}
 
-	public static function listeDemandes($dashboard = null, $settings = null) {
+	public static function listeDemandes($dashboard = null, $settings = null)
+	{
 		global $core;
 		commonDroits::min(5);
 		$settings = is_null($settings) ? $core->user->getSettings('demandes') : $settings;
@@ -2025,7 +2106,8 @@ html{height:100%}' . "\n";
 		return $res;
 	}
 
-	public static function formDemande($demande_id = 'new') {
+	public static function formDemande($demande_id = 'new')
+	{
 		global $core;
 		commonDroits::min(5);
 		$dao = new wsDAODemande($core->con);
@@ -2053,7 +2135,8 @@ html{height:100%}' . "\n";
 		return $res;
 	}
 
-	public static function reponseDemande($args) {
+	public static function reponseDemande($args)
+	{
 		global $core;
 
 		commonDroits::min(3);
@@ -2105,13 +2188,14 @@ html{height:100%}' . "\n";
 		return $res;
 	}
 
-	public static function orpiref($args) {
+	public static function orpiref($args)
+	{
 		$ref = $args[1];
 
 		#######
-        # TEMPORARY: this was broken because the cURL extension is not loaded for PHP
-        # The code in this function has been extracted and moved to hosting.fluidbook.com/orpiref/?ref=xxxxx
-        header('Location: https://hosting.fluidbook.com/orpiref/?ref='. $ref);
+		# TEMPORARY: this was broken because the cURL extension is not loaded for PHP
+		# The code in this function has been extracted and moved to hosting.fluidbook.com/orpiref/?ref=xxxxx
+		header('Location: https://hosting.fluidbook.com/orpiref/?ref=' . $ref);
 		exit;
 		#######
 
diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 4e3566b39..ee9ac8cf5 100644
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -547,6 +547,22 @@ class wsBookParametres extends wsParametres
 
 		$this->forms['scorm'] = array('label' => __('SCORM'),
 			'fieldsnames' => array('scorm_enable', 'scorm_version', 'scorm_id', 'scorm_org', 'scorm_title', 'scorm_variables', 'scorm_quizdata'));
+
+		$versions = wsUrl::getFluidbookVersions(false);
+		$ignore = ['v1', 'v2', 'phonegap'];
+		$fields = [];
+		foreach ($versions as $k => $version) {
+			if (in_array($k, $ignore)) {
+				continue;
+			}
+			$this->fields['download_' . $k] = ['type' => 'boolean', 'editable' => true, 'default' => false, 'label' => $version['title'], 'grade' => 3];
+			$fields[] = 'download_' . $k;
+		}
+		$this->fields['download_online']['default'] = true;
+
+		$this->forms['downloads'] = array('label' => __('Versions disponibles au téléchargement'),
+			'fieldsnames' => $fields);
+
 	}
 
 }
diff --git a/style/ws/style.css b/style/ws/style.css
index 0f6f31d37..a2a6efe61 100644
--- a/style/ws/style.css
+++ b/style/ws/style.css
@@ -1,120 +1,146 @@
-body{
-	height:auto;
-	background:#fff;
+body {
+	height: auto;
+	background: #fff;
 }
 
-body,table{
-	font-family:Verdana;
-	font-size:12px;
-	color:#797d62;
+body, table {
+	font-family: Verdana;
+	font-size: 12px;
+	color: #797d62;
 }
 
-a{
-	color:#f54d00;
-	text-decoration:underline;
+a {
+	color: #f54d00;
+	text-decoration: underline;
 }
 
-a:hover{
-	text-decoration:none;
+a:hover {
+	text-decoration: none;
+}
+
+abbr {
+	cursor: help;
+	border-bottom: 1px dotted #797D62;
 }
 
-abbr{cursor:help;border-bottom:1px dotted #797D62;}
+td {
+	height: 30px;
+}
 
-td{height:30px;}
+h1 {
+	color: #989b85;
+}
 
-h1{
-	color:#989b85;
+input[type="text"], input[type="password"], input[type="email"], input[type="search"], select, textarea {
+	color: #797D62;
 }
 
-input[type="text"],input[type="password"],input[type="email"],input[type="search"],select,textarea{
-	color:#797D62;
+.message {
+	text-align: center;
+	font-size: 11px;
+	color: #da4f24;
+	background: #fff;
 }
 
-.message{text-align:center;font-size:11px;color:#da4f24;background:#fff;}
-.closePopup img{margin-top:4px;}
+.closePopup img {
+	margin-top: 4px;
+}
 
-.login h1{
+.login h1 {
 	padding: 10px 10px 5px;
 }
 
-.content{
-	width:990px;
-	margin:0 auto;
-	position:relative;
+.content {
+	width: 990px;
+	margin: 0 auto;
+	position: relative;
 }
 
-.content .swfPanel{height:100%;}
+.content .swfPanel {
+	height: 100%;
+}
+
+.big .liste td {
+	font-size: 11px !important;
+	padding-left: 5px;
+	padding-right: 5px;
+}
 
-.big .liste td{font-size:11px !important;padding-left:5px;padding-right:5px;}
-.big .liste th{padding-left:5px;padding-right:5px;}
-.big .content{width:1210px;}
+.big .liste th {
+	padding-left: 5px;
+	padding-right: 5px;
+}
+
+.big .content {
+	width: 1210px;
+}
 
-.liste .bouton a{
-	height:16px;
+.liste .bouton a {
+	height: 16px;
 }
 
-#header{
-	height:94px;
-	background:url(bg-header.png) repeat-x;
-	position:relative;
+#header {
+	height: 94px;
+	background: url(bg-header.png) repeat-x;
+	position: relative;
 }
 
-#logo{
-	position:absolute;
-	top:11px;
+#logo {
+	position: absolute;
+	top: 11px;
 }
 
-#welcome{
-	position:absolute;
-	top:25px;
-	right:10px;
-	font-size:11px;
-	color:#fff;
+#welcome {
+	position: absolute;
+	top: 25px;
+	right: 10px;
+	font-size: 11px;
+	color: #fff;
 }
 
-#welcome.with-search{
-	right:250px;
+#welcome.with-search {
+	right: 250px;
 }
 
-#search{
-	background:url(search.png) no-repeat;
-	width:229px;
-	height:28px;
-	position:absolute;
-	right:10px;
-	top:20px;
+#search {
+	background: url(search.png) no-repeat;
+	width: 229px;
+	height: 28px;
+	position: absolute;
+	right: 10px;
+	top: 20px;
 }
 
-#search input{
-	background:none;
-	border:none;
-	width:180px;
-	position:absolute;
-	top:7px;
-	left:10px;
-	color:#fff;
+#search input {
+	background: none;
+	border: none;
+	width: 180px;
+	position: absolute;
+	top: 7px;
+	left: 10px;
+	color: #fff;
 }
 
-#search a{
-	margin-left:5px;
-	position:absolute;
-	top:2px;
-	right:3px;
+#search a {
+	margin-left: 5px;
+	position: absolute;
+	top: 2px;
+	right: 3px;
 }
 
-#footer{
-	display:none;
+#footer {
+	display: none;
 }
 
-#main{
-	background:url(bg-page.png) repeat-x #fff;
-	position:relative;
-	height:439px;
-	padding-top:13px;
-	padding-bottom:30px;
+#main {
+	background: url(bg-page.png) repeat-x #fff;
+	position: relative;
+	height: 439px;
+	padding-top: 13px;
+	padding-bottom: 30px;
 }
 
-#logo-main{
+#logo-main {
 	/*position:fixed;
 	background:url(bg-logo.png) no-repeat;
 	top:180px;
@@ -123,559 +149,880 @@ input[type="text"],input[type="password"],input[type="email"],input[type="search
 	height:419px;*/
 }
 
-#nav{
-	height:31px;
-	position:absolute;
-	top:63px;
-	width:960px;
+#nav {
+	height: 31px;
+	position: absolute;
+	top: 63px;
+	width: 960px;
+}
+
+.popupOverlay {
+	background: #a8aa95;
+	opacity: 0;
+	position: fixed;
+	display: none;
+	top: 0px;
+	left: 0px;
+	width: 100%;
+	height: 100%;
+}
+
+.popupWindow {
+	display: none;
+	opacity: 1;
+	position: fixed;
 }
 
-.popupOverlay{background:#a8aa95;opacity:0;position:fixed;display:none;top:0px;left:0px;width:100%;height:100%;}
-.popupWindow{display:none;opacity:1;position:fixed;}
 /*.popupWindow>table{width:600px;}*/
-.popupWindow .close{position:absolute;top:15px;right:15px;}
+.popupWindow .close {
+	position: absolute;
+	top: 15px;
+	right: 15px;
+}
 
 /* Tableaux */
-.liste{width:100% !important;min-width:960px;}
-.liste.light{width:100% !important;min-width:0px !important;}
-.liste.form{width:auto !important;min-width:0px !important;}
-.form h2,.form th,.form td,.liste th, .liste td{text-align:left;border-bottom:1px solid #fff;font-weight:normal;padding-left:10px;padding-right:10px;font-size:12px;min-height:50px;height:38px;}
-.form th,.liste th,.liste h1{font-size:12px;height:31px;font-weight:bold;vertical-align:middle;background:#fff;padding-left:10px;}
-.form tr.big th{height:40px;}
-.form h2{padding-top:6px;height:26px;}
-.form td{background:#fff;}
-.form h2,.liste td{background:#eaeaea;vertical-align:middle;}
-.form tr.odd td,.liste tr.odd td{background:#f4f4f4;}
-.liste td.bouton{padding-left:0px;padding-right:5px;}
-
-.form tr.light th,.liste tr.light th{
-	font-size:12px;background:#fff;height:22px;
-	border-bottom:1px solid #707070;
-	margin-bottom:1px;
-	padding-left:3px;
-}
-
-
-.liste tr.bold td{font-weight:bold;}
-.liste td.we{background:#e3e3e3 !important;}
-.liste td.filled,.liste td.highlight, .liste th.highlight{background:#9abf0c !important;}
-.liste .action{width:1px;}
-.liste th a{color:#797D62;text-decoration:none;font-weight:bold;}
-.liste th a:hover{text-decoration:underline;}
-.liste td a.icon img{vertical-align:middle;margin-top:0px;}
-
-.form td a img, .liste td a img{margin-top:4px;}
-
-.listeTimereport input[type="text"]{width:12px;text-align:center;font-size:10px;margin:2px;}
-.listeTimereport td, .listeTimereport th{padding-left:4px;padding-right:4px;width:16px;}
-.listeTimereport th .spacer{float:left;}
-.listeTimereport .normal{text-align:left;vertical-align:middle;padding-left:10px;padding-right:10px;width:auto;}
-.listeTimereport .info{width:30px;}
-.listeTimereport tr.bold td{border-top:1px solid #4e555c;}
-
-#devisTop{background:url(../images/devis.png) top left;width:960px;height:500px;}
-#devisMiddle{background:url(bg-document.png);width:960px;padding-bottom:20px;}
-#devisBottom{background:url(../images/devis.png) bottom left;width:960px;height:300px;}
-#factureAdresse,#devisAdresse{position:absolute;top:180px;left:520px;height:165px;width:360px;padding:0px;}
-#factureAdresse input[type="text"],#devisAdresse input[type="text"]{width:100%;}
-#factureAdresseDisplay,#devisAdresseDisplay{font-size:20px;padding:20px;position:relative;min-height:150px;}
-#factureAdresseDisplay .tva{font-size:12px;}
-#factureAdresse .edit,#devisAdresse .edit{position:absolute;top:20px;right:20px;}
-#devisTitre{position:absolute;left:56px;top:231px;width:411px;height:184px;}
-#devisLignes{padding-top:20px;}
-.devisLigne{border:1px #9aa2ae dashed;cursor:move;margin-top:20px;margin-left:20px;margin-right:20px;}
-.devisLigneLeft{width:700px;padding:20px;}
-.devisLigneRight{width:120px;float:right;text-align:center;padding:20px;}
-
-#devisMail{padding:30px;margin-top:30px;border-top:2px solid #000;}
-#devisMail td{color:#000 !important;}
+.liste {
+	width: 100% !important;
+	min-width: 960px;
+}
+
+.liste.light {
+	width: 100% !important;
+	min-width: 0px !important;
+}
+
+.liste.form {
+	width: auto !important;
+	min-width: 0px !important;
+}
+
+.form h2, .form th, .form td, .liste th, .liste td {
+	text-align: left;
+	border-bottom: 1px solid #fff;
+	font-weight: normal;
+	padding-left: 10px;
+	padding-right: 10px;
+	font-size: 12px;
+	min-height: 50px;
+	height: 38px;
+}
+
+.form th, .liste th, .liste h1 {
+	font-size: 12px;
+	height: 31px;
+	font-weight: bold;
+	vertical-align: middle;
+	background: #fff;
+	padding-left: 10px;
+}
+
+.form tr.big th {
+	height: 40px;
+}
+
+.form h2 {
+	padding-top: 6px;
+	height: 26px;
+}
+
+.form td {
+	background: #fff;
+}
+
+.form h2, .liste td {
+	background: #eaeaea;
+	vertical-align: middle;
+}
+
+.form tr.odd td, .liste tr.odd td {
+	background: #f4f4f4;
+}
+
+.liste td.bouton {
+	padding-left: 0px;
+	padding-right: 5px;
+}
+
+.form tr.light th, .liste tr.light th {
+	font-size: 12px;
+	background: #fff;
+	height: 22px;
+	border-bottom: 1px solid #707070;
+	margin-bottom: 1px;
+	padding-left: 3px;
+}
+
+.liste tr.bold td {
+	font-weight: bold;
+}
+
+.liste td.we {
+	background: #e3e3e3 !important;
+}
+
+.liste td.filled, .liste td.highlight, .liste th.highlight {
+	background: #9abf0c !important;
+}
+
+.liste .action {
+	width: 1px;
+}
+
+.liste th a {
+	color: #797D62;
+	text-decoration: none;
+	font-weight: bold;
+}
+
+.liste th a:hover {
+	text-decoration: underline;
+}
+
+.liste td a.icon img {
+	vertical-align: middle;
+	margin-top: 0px;
+}
+
+.form td a img, .liste td a img {
+	margin-top: 4px;
+}
+
+.listeTimereport input[type="text"] {
+	width: 12px;
+	text-align: center;
+	font-size: 10px;
+	margin: 2px;
+}
+
+.listeTimereport td, .listeTimereport th {
+	padding-left: 4px;
+	padding-right: 4px;
+	width: 16px;
+}
+
+.listeTimereport th .spacer {
+	float: left;
+}
+
+.listeTimereport .normal {
+	text-align: left;
+	vertical-align: middle;
+	padding-left: 10px;
+	padding-right: 10px;
+	width: auto;
+}
+
+.listeTimereport .info {
+	width: 30px;
+}
+
+.listeTimereport tr.bold td {
+	border-top: 1px solid #4e555c;
+}
+
+#devisTop {
+	background: url(../images/devis.png) top left;
+	width: 960px;
+	height: 500px;
+}
+
+#devisMiddle {
+	background: url(bg-document.png);
+	width: 960px;
+	padding-bottom: 20px;
+}
+
+#devisBottom {
+	background: url(../images/devis.png) bottom left;
+	width: 960px;
+	height: 300px;
+}
+
+#factureAdresse, #devisAdresse {
+	position: absolute;
+	top: 180px;
+	left: 520px;
+	height: 165px;
+	width: 360px;
+	padding: 0px;
+}
+
+#factureAdresse input[type="text"], #devisAdresse input[type="text"] {
+	width: 100%;
+}
+
+#factureAdresseDisplay, #devisAdresseDisplay {
+	font-size: 20px;
+	padding: 20px;
+	position: relative;
+	min-height: 150px;
+}
+
+#factureAdresseDisplay .tva {
+	font-size: 12px;
+}
+
+#factureAdresse .edit, #devisAdresse .edit {
+	position: absolute;
+	top: 20px;
+	right: 20px;
+}
+
+#devisTitre {
+	position: absolute;
+	left: 56px;
+	top: 231px;
+	width: 411px;
+	height: 184px;
+}
+
+#devisLignes {
+	padding-top: 20px;
+}
+
+.devisLigne {
+	border: 1px #9aa2ae dashed;
+	cursor: move;
+	margin-top: 20px;
+	margin-left: 20px;
+	margin-right: 20px;
+}
+
+.devisLigneLeft {
+	width: 700px;
+	padding: 20px;
+}
+
+.devisLigneRight {
+	width: 120px;
+	float: right;
+	text-align: center;
+	padding: 20px;
+}
+
+#devisMail {
+	padding: 30px;
+	margin-top: 30px;
+	border-top: 2px solid #000;
+}
+
+#devisMail td {
+	color: #000 !important;
+}
 
 /* Pagers */
 
-.pager-holder{
-	padding:10px;
-	padding-bottom:0px;
-	float:none;
+.pager-holder {
+	padding: 10px;
+	padding-bottom: 0px;
+	float: none;
+}
+
+.pager {
+	text-align: center;
+}
+
+.pager a, .pager strong {
+	padding: 2px;
+	height: 10px;
+	font-weight: bold;
 }
-.pager{
-	text-align:center;
+
+.pager a {
+	text-decoration: none;
 }
-.pager a, .pager strong{
-	padding:2px;
-	height:10px;
-	font-weight:bold;
+
+.pager a:hover {
+	text-decoration: none;
 }
-.pager a{text-decoration:none;}
-.pager a:hover{text-decoration:none;}
 
 /* Pager Left */
-.pager.pgleft a{
-	background:transparent;
-	border:1px solid #9abf0c;
-	color:#9abf0c;
+.pager.pgleft a {
+	background: transparent;
+	border: 1px solid #9abf0c;
+	color: #9abf0c;
 }
+
 .pager.pgleft a:hover,
-.pager.pgleft strong{
-	background:#cce56c url(pager-left-active.png) repeat-x bottom left;
-	border:1px solid #9abf0c;
-	color:#797d62;
+.pager.pgleft strong {
+	background: #cce56c url(pager-left-active.png) repeat-x bottom left;
+	border: 1px solid #9abf0c;
+	color: #797d62;
 }
 
-.formParPage{
-	padding:5px;
-	float:right;
+.formParPage {
+	padding: 5px;
+	float: right;
 }
 
-
 /* Barre de raccourcis */
-#bar{
-	background:url(bg-bar.png) repeat-x #fff bottom left;
+#bar {
+	background: url(bg-bar.png) repeat-x #fff bottom left;
+}
+
+#bar.vide {
+	height: 16px;
+	background: url(bg-bar-vide.png) repeat-x #fff bottom left;
+}
+
+#bar .content {
+	height: 60px;
 }
 
-#bar.vide{
-	height:16px;
-	background:url(bg-bar-vide.png) repeat-x #fff bottom left;
+.shortcut .note {
+	color: #333;
+	padding: 10px;
 }
 
-#bar .content{
-	height:60px;
+.shortcut {
+	float: left;
+	margin-left: 5px;
+	margin-top: 3px;
 }
 
-.shortcut .note{color:#333;padding:10px;}
-.shortcut{float:left;margin-left:5px;margin-top:3px;}
-.shortcut .step{margin-top:5px;}
+.shortcut .step {
+	margin-top: 5px;
+}
 
-.shortcut .label{
-	margin:15px 20px 0 5px;
+.shortcut .label {
+	margin: 15px 20px 0 5px;
 	font-size: 16px;
-	font-family:UniversCondensedBold;
+	font-family: UniversCondensedBold;
 	text-transform: uppercase;
 }
 
 /* Filtres */
-.filtre{
-	color:#5f6162;
-	width:160px;
-	float:left;
-	margin-left:10px;
-	padding-top:1px;
-	position:relative;
-}
-.filtre span{
-	font-size:9px;
-	color:#5f6162;
-	margin-left:5px;
-	cursor:pointer;
-}
-.filtre .bt{
-	position:absolute;
-	top:2px;
-	right:3px;
-	width:155px;
-	height:18px;
-}
-.filtre .input{
-	width:135px;
-	height:23px;
-	background-image:url(filtres.png);
-	background-repeat:no-repeat;
-	padding:5px;
-	padding-right:20px;
-	margin-left:5px;
-	position:relative;
-}
-.filtre .input.active{
-	font-weight:bold;
-}
-.filtre a{
-	color:#5f6162;
-	text-decoration:none;
-	height:23px;
-}
-
-.filtre ul{
-	display:none;
-	position:absolute;
-	top:36px;
-	left:5px;
-	z-index:20;
-	width:160px;
-	cursor:pointer;
-}
-
-.filtre .input span{
-	font-size:12px;
-}
-.filtre ul li.first{
-	padding-top:2px;
-}
-.filtre ul li{
-	list-style-type:none;
-	padding-left:20px;
-	background-image:url(filtre-list-m.png);
-}
-.filtre ul li.last{
-	background-image:url(filtre-list-b.png);
-	background-position:0 100%;
-	padding-bottom:5px;
-}
-.filtre ul li.all{
-	display:none;
-}
-.efface_filtres{padding-right:20px;padding-top:10px;float:right;}
+.filtre {
+	color: #5f6162;
+	width: 160px;
+	float: left;
+	margin-left: 10px;
+	padding-top: 1px;
+	position: relative;
+}
+
+.filtre span {
+	font-size: 9px;
+	color: #5f6162;
+	margin-left: 5px;
+	cursor: pointer;
+}
+
+.filtre .bt {
+	position: absolute;
+	top: 2px;
+	right: 3px;
+	width: 155px;
+	height: 18px;
+}
+
+.filtre .input {
+	width: 135px;
+	height: 23px;
+	background-image: url(filtres.png);
+	background-repeat: no-repeat;
+	padding: 5px;
+	padding-right: 20px;
+	margin-left: 5px;
+	position: relative;
+}
+
+.filtre .input.active {
+	font-weight: bold;
+}
+
+.filtre a {
+	color: #5f6162;
+	text-decoration: none;
+	height: 23px;
+}
+
+.filtre ul {
+	display: none;
+	position: absolute;
+	top: 36px;
+	left: 5px;
+	z-index: 20;
+	width: 160px;
+	cursor: pointer;
+}
+
+.filtre .input span {
+	font-size: 12px;
+}
+
+.filtre ul li.first {
+	padding-top: 2px;
+}
+
+.filtre ul li {
+	list-style-type: none;
+	padding-left: 20px;
+	background-image: url(filtre-list-m.png);
+}
+
+.filtre ul li.last {
+	background-image: url(filtre-list-b.png);
+	background-position: 0 100%;
+	padding-bottom: 5px;
+}
+
+.filtre ul li.all {
+	display: none;
+}
+
+.efface_filtres {
+	padding-right: 20px;
+	padding-top: 10px;
+	float: right;
+}
 
 /* Dashboard */
-.dashboard{
-	position:relative;
-	margin-bottom:10px;
+.dashboard {
+	position: relative;
+	margin-bottom: 10px;
 }
-.dashboard .caption{
-	position:relative;
-	left:20px;
-	display:inline;
-	cursor:move;
+
+.dashboard .caption {
+	position: relative;
+	left: 20px;
+	display: inline;
+	cursor: move;
 }
 
-.dashboard .edit{
-	position:absolute;
-	right:40px;
-	top:-17px;
+.dashboard .edit {
+	position: absolute;
+	right: 40px;
+	top: -17px;
 }
 
-.dashboard .delete{
-	position:absolute;
-	right:10px;
-	top:-17px;
+.dashboard .delete {
+	position: absolute;
+	right: 10px;
+	top: -17px;
 }
 
-.dashboard .toggle{
-	position:absolute;
-	left:12px;
-	top:-10px;
-	background-image:url(arrows.png);
-	background-position:0 0;
-	width:18px;
-	height:10px;
+.dashboard .toggle {
+	position: absolute;
+	left: 12px;
+	top: -10px;
+	background-image: url(arrows.png);
+	background-position: 0 0;
+	width: 18px;
+	height: 10px;
 }
 
-.dashboard .toggle.close{
-	background-position:0 100%;
+.dashboard .toggle.close {
+	background-position: 0 100%;
 }
 
-.dashboard div.close .liste{
-	display:none;
+.dashboard div.close .liste {
+	display: none;
 }
 
-.dashboard .b-c{
-	width:960px !important;
-	height:auto !important;
+.dashboard .b-c {
+	width: 960px !important;
+	height: auto !important;
 }
 
 /* Menu Contextuel */
-.contextMenu{border:1px solid #000;float:left;position:absolute;display:none;z-index:100000;}
-.contextMenu li a{
-	border-bottom:1px solid #ccc;
-	padding:12px;
-	padding-left:20px;
-	padding-right:20px;
-	background:#fff;
-	min-height:12px;
-	text-decoration:none;
-	display:inline-block;
-}
-.contextMenu li a:hover{background:#ccc;}
-.contextMenu li img{margin:5px;margin-right:7px;vertical-align:middle;float:none;}
-.contextMenu li.head{background:#666b74;font-weight:bold;color:#fff;text-align:center;border-bottom:1px solid #000;}
+.contextMenu {
+	border: 1px solid #000;
+	float: left;
+	position: absolute;
+	display: none;
+	z-index: 100000;
+}
+
+.contextMenu li.disabled a {
+	color: #ccc;
+	text-decoration: line-through;
+}
+
+.contextMenu li.disabled a:hover {
+	color: #fff;
+	text-decoration: line-through;
+}
+
+.contextMenu li a {
+	border-bottom: 1px solid #ccc;
+	padding: 12px;
+	padding-left: 20px;
+	padding-right: 20px;
+	background: #fff;
+	min-height: 12px;
+	text-decoration: none;
+	display: inline-block;
+}
+
+.contextMenu li a:hover {
+	background: #ccc;
+}
+
+.contextMenu li img {
+	margin: 5px;
+	margin-right: 7px;
+	vertical-align: middle;
+	float: none;
+}
+
+.contextMenu li.head {
+	background: #666b74;
+	font-weight: bold;
+	color: #fff;
+	text-align: center;
+	border-bottom: 1px solid #000;
+}
 
 /* Autocomplete */
-.ac_results{
-	background:#fff;
-	border:1px solid #acacac;
-	color:#666;
-	padding:2px;
-	z-index:100000 !important;
+.ac_results {
+	background: #fff;
+	border: 1px solid #acacac;
+	color: #666;
+	padding: 2px;
+	z-index: 100000 !important;
 }
 
-.ac_results li{
-	cursor:pointer;
-	padding:2px;
-	margin:1px;
-	list-style-type:none;
+.ac_results li {
+	cursor: pointer;
+	padding: 2px;
+	margin: 1px;
+	list-style-type: none;
 }
 
-.ac_results li:hover, .ac_over{
-	background:#4e535e;
-	color:#fff;
+.ac_results li:hover, .ac_over {
+	background: #4e535e;
+	color: #fff;
 }
 
-.ac_results iframe{
-	display:none;
+.ac_results iframe {
+	display: none;
 }
 
 /* Traduction */
-#traduction div table td{padding:5px;background:#dbdde2;color:#333;vertical-align:top;}
-#traduction div table .odd td{background:#ecedf0;}
-#traduction div table .save td{background-color:#4e535b;background-image:url(b-h.png);background-repeat:repeat-x;}
+#traduction div table td {
+	padding: 5px;
+	background: #dbdde2;
+	color: #333;
+	vertical-align: top;
+}
+
+#traduction div table .odd td {
+	background: #ecedf0;
+}
+
+#traduction div table .save td {
+	background-color: #4e535b;
+	background-image: url(b-h.png);
+	background-repeat: repeat-x;
+}
 
 /* Erreur */
-.error{border:1px solid #f00;}
+.error {
+	border: 1px solid #f00;
+}
 
-#uploaderContainer{width:970px;height:50px;}
+#uploaderContainer {
+	width: 970px;
+	height: 50px;
+}
 
-.gris{background-color:#ecedf0;}
+.gris {
+	background-color: #ecedf0;
+}
 
-#listeBooks{width:100%;height:auto;}
+#listeBooks {
+	width: 100%;
+	height: auto;
+}
 
 /* Stats */
-.graphStats table{
-	width:auto !important;
+.graphStats table {
+	width: auto !important;
 }
-.graphStats td,.graphStats th{
-	padding:0px;
-	background:none transparent;
-	height:auto;
+
+.graphStats td, .graphStats th {
+	padding: 0px;
+	background: none transparent;
+	height: auto;
 }
-.graphStats .echelle td{
-	text-align:center;
+
+.graphStats .echelle td {
+	text-align: center;
 }
 
-.graphStats .graph-note{
-	position:absolute;
-	left:900px;
-	color:#f54d00;
-	padding-left:2px;
-	padding-right:2px;
-	background:#fff;
+.graphStats .graph-note {
+	position: absolute;
+	left: 900px;
+	color: #f54d00;
+	padding-left: 2px;
+	padding-right: 2px;
+	background: #fff;
 }
 
-.graphStats .legende{
-	margin-top:10px;
-	margin-bottom:10px;
+.graphStats .legende {
+	margin-top: 10px;
+	margin-bottom: 10px;
 }
 
-.graphStats .legende td{
-	margin-top:10px;
-	margin-bottom:10px;
+.graphStats .legende td {
+	margin-top: 10px;
+	margin-bottom: 10px;
 }
 
-.graphStats .graph-container{
-	width:944px;
-	height:306px;
+.graphStats .graph-container {
+	width: 944px;
+	height: 306px;
 }
 
-th.stats_col,td.stats_col{
-	text-align:center;
+th.stats_col, td.stats_col {
+	text-align: center;
 }
 
-th.stats_col{
-	width:130px;
+th.stats_col {
+	width: 130px;
 }
-.stats_col.max{
-	width:600px;
-	text-align:left;
+
+.stats_col.max {
+	width: 600px;
+	text-align: left;
 }
 
-.stats_links .liste,.stats_country .liste,.stats_search .liste{
-	min-width:315px;width:315px;max-width: 315px;max-height:400px;
+.stats_links .liste, .stats_country .liste, .stats_search .liste {
+	min-width: 315px;
+	width: 315px;
+	max-width: 315px;
+	max-height: 400px;
 }
 
-.stats_links,.stats_country,.stats_search{
-	float:left;
-	margin-left:0px;
+.stats_links, .stats_country, .stats_search {
+	float: left;
+	margin-left: 0px;
 }
 
-.stats_country,.stats_search{
-	margin-left:13px;
+.stats_country, .stats_search {
+	margin-left: 13px;
 }
 
 /* Download book contextMenu */
-.downbookContextMenu li{
-	height:auto;
+.downbookContextMenu li {
+	height: auto;
 }
 
-.downbookContextMenu a{
-	text-decoration:none;
+.downbookContextMenu a {
+	text-decoration: none;
 }
 
-.onglet:hover, .onglet.active{
-	color:#797D62;
+.onglet:hover, .onglet.active {
+	color: #797D62;
 }
 
-#accepteDemandes{
-	padding:10px;
+#accepteDemandes {
+	padding: 10px;
 }
 
-#restoreLinks{
-	margin:10px;
+#restoreLinks {
+	margin: 10px;
 }
 
-#restoreLinks hr{
-	margin:10px 0;
+#restoreLinks hr {
+	margin: 10px 0;
 }
 
-#restoreLinks h2{
-	margin:5px 0 10px 0;
+#restoreLinks h2 {
+	margin: 5px 0 10px 0;
 }
 
-a.btbook{
-	display:inline-block;
-	height:16px;
-	padding:2px 6px 2px 2px;
-	border:1px solid #fff;
-	border-radius:5px;
-	background-color: rgb(251,251,251);
+a.btbook {
+	display: inline-block;
+	height: 16px;
+	padding: 2px 6px 2px 2px;
+	border: 1px solid #fff;
+	border-radius: 5px;
+	background-color: rgb(251, 251, 251);
 	background-image: url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSI2OCUiIHN0b3AtY29sb3I9IiNmYmZiZmIiIHN0b3Atb3BhY2l0eT0iMSIvPgogICAgPHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjZTVlNmU2IiBzdG9wLW9wYWNpdHk9IjEiLz4KICA8L2xpbmVhckdyYWRpZW50PgogIDxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZ3JhZC11Y2dnLWdlbmVyYXRlZCkiIC8+Cjwvc3ZnPg==");
-	background-image: -moz-linear-gradient(top, rgba(251,251,251,1) 68%, rgba(229,230,230,1) 100%);
-	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(68%,rgba(251,251,251,1)), color-stop(100%,rgba(229,230,230,1)));
-	background-image: -webkit-linear-gradient(top, rgba(251,251,251,1) 68%,rgba(229,230,230,1) 100%);
-	background-image: -o-linear-gradient(top, rgba(251,251,251,1) 68%,rgba(229,230,230,1) 100%);
-	background-image: -ms-linear-gradient(top, rgba(251,251,251,1) 68%,rgba(229,230,230,1) 100%);
-	background-image: linear-gradient(to bottom, rgba(251,251,251,1) 68%,rgba(229,230,230,1) 100%);
+	background-image: -moz-linear-gradient(top, rgba(251, 251, 251, 1) 68%, rgba(229, 230, 230, 1) 100%);
+	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(68%, rgba(251, 251, 251, 1)), color-stop(100%, rgba(229, 230, 230, 1)));
+	background-image: -webkit-linear-gradient(top, rgba(251, 251, 251, 1) 68%, rgba(229, 230, 230, 1) 100%);
+	background-image: -o-linear-gradient(top, rgba(251, 251, 251, 1) 68%, rgba(229, 230, 230, 1) 100%);
+	background-image: -ms-linear-gradient(top, rgba(251, 251, 251, 1) 68%, rgba(229, 230, 230, 1) 100%);
+	background-image: linear-gradient(to bottom, rgba(251, 251, 251, 1) 68%, rgba(229, 230, 230, 1) 100%);
 	line-height: 16px;
-	font-size:13px;
-	color:#b1b5a0;
+	font-size: 13px;
+	color: #b1b5a0;
 	font-family: UniversCondensedBold;
 	text-decoration: none;
 	text-transform: uppercase;
 	white-space: nowrap;
 
-
-	-moz-box-shadow: 0px 0px 2px rgba(0,0,0,0.25);
-	-webkit-box-shadow: 0px 0px 2px rgba(0,0,0,0.25);
-	-ms-box-shadow: 0px 0px 2px rgba(0,0,0,0.25);
-	-o-box-shadow: 0px 0px 2px rgba(0,0,0,0.25);
-	box-shadow: 0px 0px 2px rgba(0,0,0,0.25);
+	-moz-box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.25);
+	-webkit-box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.25);
+	-ms-box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.25);
+	-o-box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.25);
+	box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.25);
 }
 
-a.btbook>div{
-	display:inline-block;
-	width:16px;
-	height:16px !important;
+a.btbook > div {
+	display: inline-block;
+	width: 16px;
+	height: 16px !important;
 	background-position: 0 0;
 }
 
-a.btbook>span{
-	display:inline-block;
+a.btbook > span {
+	display: inline-block;
 	vertical-align: top;
-	margin:0 0 0 5px;
+	margin: 0 0 0 5px;
 }
 
-a.btbook:hover>div{
+a.btbook:hover > div {
 	background-position: 0 100%;
 }
 
-a.btbook.suppr>div{
+a.btbook.suppr > div {
 	background-image: url("../../images/ws/btdel.png");
 }
 
-a.btbook.voir>div{
+a.btbook.voir > div {
 	background-image: url("../../images/ws/btview.png");
 }
 
-a.btbook.download>div{
+a.btbook.download > div {
 	background-image: url("../../images/ws/btdownload.png");
 }
 
-a.btbook.stats>div{
+a.btbook.stats > div {
 	background-image: url("../../images/ws/btstats.png");
 }
-a.btbook.edit>div{
+
+a.btbook.edit > div {
 	background-image: url("../../images/ws/btedit.png");
 }
 
-
-
-
 /* Page tree */
 
-#collection{
-	padding:5px;
+#collection {
+	padding: 5px;
+}
+
+#collection td.pad {
+	padding: 15px 0;
 }
 
-#collection td.pad{
-	padding:15px 0;	
+#collection .min.nowrap {
+	padding: 0 15px 0 0;
 }
 
-#collection .min.nowrap{
-	padding:0 15px 0 0;
+#collection h1 {
+	margin: 5px 0 10px;
+	padding: 0;
 }
 
-#collection h1{
-	margin:5px 0 10px;
-	padding:0;
+#collection .group.empty {
+	display: none;
 }
 
-#collection .group.empty{
-	display:none;
+#collection .g {
+	padding: 2px 6px;
 }
 
-#collection .g{
-	padding:2px 6px;
+#collection h3 {
+	margin: 10px 0 10px 0 !important;
+	border-top: 2px solid #BEBFB1;
+	padding: 10px 0 0 0;
 }
 
-#collection h3{margin:10px 0 10px 0 !important;border-top:2px solid #BEBFB1;padding:10px 0 0 0;}
 #collection .group,
-#collection .publication{
-	padding:5px;border:1px solid #ccc;margin:2px 0;background-color:#eee;
+#collection .publication {
+	padding: 5px;
+	border: 1px solid #ccc;
+	margin: 2px 0;
+	background-color: #eee;
 }
 
-#collection .publication{
-	background-color:#fff;
+#collection .publication {
+	background-color: #fff;
 }
 
-#collection ul{
+#collection ul {
 	list-style: none;
 }
 
-#collection div{
-	height:20px;
+#collection div {
+	height: 20px;
 }
 
 #collection div span,
-#collection div a{
-	display:block;
-	height:16px;
-	float:left;
+#collection div a {
+	display: block;
+	height: 16px;
+	float: left;
 }
 
 #collection div .move,
 #collection div .add,
-#collection div .delete
-{
-	width:16px;
+#collection div .delete {
+	width: 16px;
 }
 
+#collection div img {
+	vertical-align: bottom;
+}
 
-#collection div img{vertical-align:bottom;}
-#collection div .move{margin-right:10px;background-image: url("/images/ws/tango16/actions/mail-send-receive.png")}
-#collection div .add{float:right;margin-right:10px;background-image: url("/images/ws/tango16/actions/list-add.png")}
-#collection div .online{float:right;margin-right:10px;}
-#collection div .online .checkbox{
-	background-image:url("/CubeIT/images/online-offline.png");
+#collection div .move {
+	margin-right: 10px;
+	background-image: url("/images/ws/tango16/actions/mail-send-receive.png")
+}
+
+#collection div .add {
+	float: right;
+	margin-right: 10px;
+	background-image: url("/images/ws/tango16/actions/list-add.png")
+}
+
+#collection div .online {
+	float: right;
+	margin-right: 10px;
+}
+
+#collection div .online .checkbox {
+	background-image: url("/CubeIT/images/online-offline.png");
 	background-repeat: no-repeat;
 	background-position: 0 100%;
-	width:16px;
-	height:16px;
-	cursor:pointer;
+	width: 16px;
+	height: 16px;
+	cursor: pointer;
 }
-#collection div .online .checkbox[checked]{
+
+#collection div .online .checkbox[checked] {
 	background-position: 0 0;
 }
 
-#collection div .delete{float:right;margin-right:10px;background-image: url("/images/ws/tango16/actions/list-remove.png")}
-#collection div .id{font-weight:bold;margin-right:10px;}
-#collection div .name{margin-right:10px;}
+#collection div .delete {
+	float: right;
+	margin-right: 10px;
+	background-image: url("/images/ws/tango16/actions/list-remove.png")
+}
+
+#collection div .id {
+	font-weight: bold;
+	margin-right: 10px;
+}
+
+#collection div .name {
+	margin-right: 10px;
+}
 
 #collection input,
-#collection select{
-	width:auto;
+#collection select {
+	width: auto;
 }
 
-#collection .submit{
-	float:right;
+#collection .submit {
+	float: right;
 }
 
-.b{
+.b {
 
 	-moz-box-shadow: none;
 	-ms-box-shadow: none;