From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 5 May 2014 11:55:02 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=c56325d76c0043133dd9aad9931db3ae2ded1ee5;p=cubeextranet.git

---

diff --git a/fluidbook/icones/11/nav-2d.png b/fluidbook/icones/11/nav-2d.png
new file mode 100644
index 000000000..86cbf3b5d
Binary files /dev/null and b/fluidbook/icones/11/nav-2d.png differ
diff --git a/fluidbook/icones/11/nav-3d.png b/fluidbook/icones/11/nav-3d.png
new file mode 100644
index 000000000..2d37550bb
Binary files /dev/null and b/fluidbook/icones/11/nav-3d.png differ
diff --git a/fluidbook/icones/11/nav-archives.png b/fluidbook/icones/11/nav-archives.png
new file mode 100644
index 000000000..4a7c8fa46
Binary files /dev/null and b/fluidbook/icones/11/nav-archives.png differ
diff --git a/fluidbook/icones/11/nav-basket.png b/fluidbook/icones/11/nav-basket.png
new file mode 100644
index 000000000..9c24a9430
Binary files /dev/null and b/fluidbook/icones/11/nav-basket.png differ
diff --git a/fluidbook/icones/11/nav-bookmark.png b/fluidbook/icones/11/nav-bookmark.png
new file mode 100644
index 000000000..7d4a72bf3
Binary files /dev/null and b/fluidbook/icones/11/nav-bookmark.png differ
diff --git a/fluidbook/icones/11/nav-friend.png b/fluidbook/icones/11/nav-friend.png
new file mode 100644
index 000000000..3ba60607c
Binary files /dev/null and b/fluidbook/icones/11/nav-friend.png differ
diff --git a/fluidbook/icones/11/nav-fullscreen.png b/fluidbook/icones/11/nav-fullscreen.png
new file mode 100644
index 000000000..cd33a9cdc
Binary files /dev/null and b/fluidbook/icones/11/nav-fullscreen.png differ
diff --git a/fluidbook/icones/11/nav-help.png b/fluidbook/icones/11/nav-help.png
new file mode 100644
index 000000000..aec72cf9e
Binary files /dev/null and b/fluidbook/icones/11/nav-help.png differ
diff --git a/fluidbook/icones/11/nav-home.png b/fluidbook/icones/11/nav-home.png
new file mode 100644
index 000000000..7466c7ccf
Binary files /dev/null and b/fluidbook/icones/11/nav-home.png differ
diff --git a/fluidbook/icones/11/nav-index.png b/fluidbook/icones/11/nav-index.png
new file mode 100644
index 000000000..3f7e86048
Binary files /dev/null and b/fluidbook/icones/11/nav-index.png differ
diff --git a/fluidbook/icones/11/nav-map.png b/fluidbook/icones/11/nav-map.png
new file mode 100644
index 000000000..6a87f874f
Binary files /dev/null and b/fluidbook/icones/11/nav-map.png differ
diff --git a/fluidbook/icones/11/nav-normal.png b/fluidbook/icones/11/nav-normal.png
new file mode 100644
index 000000000..c88591fab
Binary files /dev/null and b/fluidbook/icones/11/nav-normal.png differ
diff --git a/fluidbook/icones/11/nav-normalscreen.png b/fluidbook/icones/11/nav-normalscreen.png
new file mode 100644
index 000000000..e5e369a94
Binary files /dev/null and b/fluidbook/icones/11/nav-normalscreen.png differ
diff --git a/fluidbook/icones/11/nav-previous.png b/fluidbook/icones/11/nav-previous.png
new file mode 100644
index 000000000..14435c358
Binary files /dev/null and b/fluidbook/icones/11/nav-previous.png differ
diff --git a/fluidbook/icones/11/nav-print.png b/fluidbook/icones/11/nav-print.png
new file mode 100644
index 000000000..06bde71a9
Binary files /dev/null and b/fluidbook/icones/11/nav-print.png differ
diff --git a/fluidbook/icones/11/nav-save.png b/fluidbook/icones/11/nav-save.png
new file mode 100644
index 000000000..676bd29da
Binary files /dev/null and b/fluidbook/icones/11/nav-save.png differ
diff --git a/fluidbook/icones/11/nav-sommaire.png b/fluidbook/icones/11/nav-sommaire.png
new file mode 100644
index 000000000..f6eb68dc4
Binary files /dev/null and b/fluidbook/icones/11/nav-sommaire.png differ
diff --git a/fluidbook/icones/11/nav-soundoff.png b/fluidbook/icones/11/nav-soundoff.png
new file mode 100644
index 000000000..0b67bba0c
Binary files /dev/null and b/fluidbook/icones/11/nav-soundoff.png differ
diff --git a/fluidbook/icones/11/nav-soundon.png b/fluidbook/icones/11/nav-soundon.png
new file mode 100644
index 000000000..81fda42c3
Binary files /dev/null and b/fluidbook/icones/11/nav-soundon.png differ
diff --git a/fluidbook/icones/11/nav-tag.png b/fluidbook/icones/11/nav-tag.png
new file mode 100644
index 000000000..84f16382d
Binary files /dev/null and b/fluidbook/icones/11/nav-tag.png differ
diff --git a/fluidbook/icones/11/nav-zoomin.png b/fluidbook/icones/11/nav-zoomin.png
new file mode 100644
index 000000000..304d88656
Binary files /dev/null and b/fluidbook/icones/11/nav-zoomin.png differ
diff --git a/fluidbook/icones/11/nav-zoomout.png b/fluidbook/icones/11/nav-zoomout.png
new file mode 100644
index 000000000..52ad93491
Binary files /dev/null and b/fluidbook/icones/11/nav-zoomout.png differ
diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index 58ddd9781..cd9adc109 100644
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -799,6 +799,8 @@ class wsAjax extends cubeAjax {
 	}
 
 	public static function importLinksAsExcel($args) {
+		set_time_limit(0);
+
 		global $core;
 		$book_id = $args[1];
 
diff --git a/inc/ws/Util/class.ws.links.php b/inc/ws/Util/class.ws.links.php
index 912911c4f..8691c5b1a 100644
--- a/inc/ws/Util/class.ws.links.php
+++ b/inc/ws/Util/class.ws.links.php
@@ -13,6 +13,8 @@
 class wsLinks {
 
 	public static function linksToExcel($links, $rulers, $pages = null) {
+		set_time_limit(0);
+
 		$cols = array(
 			'page' => __('Page de la publication'), 'left' => __('x'), 'top' => __('y'), 'width' => __('Largeur'), 'height' => __('Hauteur'), 'rot' => __('Rotation'),
 			'type' => __('Type'), 'to' => __('Destination'), 'target' => __('Cible'),
@@ -62,15 +64,19 @@ class wsLinks {
 					}
 				} else {
 
-					if (is_bool($l[$id])) {
-						$l[$id] = $l[$id] ? 1 : 0;
-					}
-					if ($id == 'numerotation') {
-						if ($l[$id] == 'false') {
-							$l[$id] = 'physical';
+					if (isset($l[$id])) {
+						if (is_bool($l[$id])) {
+							$l[$id] = $l[$id] ? 1 : 0;
+						}
+						if ($id == 'numerotation') {
+							if ($l[$id] == 'false') {
+								$l[$id] = 'physical';
+							}
 						}
+						$value = $l[$id];
+					} else {
+						$value = '';
 					}
-					$value = $l[$id];
 				}
 				if ($value != '') {
 					$s->setCellValueByColumnAndRow($i, $j, $value);