(no commit message)

diff --git a/fluidbook/icones/11/nav-2d.png b/fluidbook/icones/11/nav-2d.png
new file mode 100644 (file)
index 0000000..86cbf3b
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 (file)
index 0000000..2d37550
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 (file)
index 0000000..4a7c8fa
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 (file)
index 0000000..9c24a94
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 (file)
index 0000000..7d4a72b
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 (file)
index 0000000..3ba6060
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 (file)
index 0000000..cd33a9c
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 (file)
index 0000000..aec72cf
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 (file)
index 0000000..7466c7c
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 (file)
index 0000000..3f7e860
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 (file)
index 0000000..6a87f87
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 (file)
index 0000000..c88591f
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 (file)
index 0000000..e5e369a
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 (file)
index 0000000..14435c3
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 (file)
index 0000000..06bde71
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 (file)
index 0000000..676bd29
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 (file)
index 0000000..f6eb68d
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 (file)
index 0000000..0b67bba
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 (file)
index 0000000..81fda42
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 (file)
index 0000000..84f1638
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 (file)
index 0000000..304d886
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 (file)
index 0000000..52ad934
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 58ddd97818b2ec43e51fd2dc732fd4fd4e9c8d35..cd9adc1097861938432fd4a4fdc59b18a417b456 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -799,6 +799,8 @@ class wsAjax extends cubeAjax {
        }\r
 \r
        public static function importLinksAsExcel($args) {\r
+               set_time_limit(0);\r
+\r
                global $core;\r
                $book_id = $args[1];\r
 \r

diff --git a/inc/ws/Util/class.ws.links.php b/inc/ws/Util/class.ws.links.php
index 912911c4f4e3be5c65474b54903cf924a8c99c12..8691c5b1aa8432809cca352697a4c72f948cf32f 100644 (file)
--- 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);