(no commit message)

diff --git a/fluidbook/icones/3/nav-2d.png b/fluidbook/icones/3/nav-2d.png
new file mode 100644 (file)
index 0000000..a8ba6d7
Binary files /dev/null and b/fluidbook/icones/3/nav-2d.png differ

diff --git a/fluidbook/icones/3/nav-3d.png b/fluidbook/icones/3/nav-3d.png
new file mode 100644 (file)
index 0000000..032e2da
Binary files /dev/null and b/fluidbook/icones/3/nav-3d.png differ

diff --git a/fluidbook/icones/3/nav-archives.png b/fluidbook/icones/3/nav-archives.png
new file mode 100644 (file)
index 0000000..a7d293a
Binary files /dev/null and b/fluidbook/icones/3/nav-archives.png differ

diff --git a/fluidbook/icones/3/nav-basket.png b/fluidbook/icones/3/nav-basket.png
new file mode 100644 (file)
index 0000000..d4c4baa
Binary files /dev/null and b/fluidbook/icones/3/nav-basket.png differ

diff --git a/fluidbook/icones/3/nav-bookmark.png b/fluidbook/icones/3/nav-bookmark.png
new file mode 100644 (file)
index 0000000..111b08b
Binary files /dev/null and b/fluidbook/icones/3/nav-bookmark.png differ

diff --git a/fluidbook/icones/3/nav-friend.png b/fluidbook/icones/3/nav-friend.png
new file mode 100644 (file)
index 0000000..b4e9b29
Binary files /dev/null and b/fluidbook/icones/3/nav-friend.png differ

diff --git a/fluidbook/icones/3/nav-fullscreen.png b/fluidbook/icones/3/nav-fullscreen.png
new file mode 100644 (file)
index 0000000..9b80abe
Binary files /dev/null and b/fluidbook/icones/3/nav-fullscreen.png differ

diff --git a/fluidbook/icones/3/nav-help.png b/fluidbook/icones/3/nav-help.png
new file mode 100644 (file)
index 0000000..a45edc9
Binary files /dev/null and b/fluidbook/icones/3/nav-help.png differ

diff --git a/fluidbook/icones/3/nav-index.png b/fluidbook/icones/3/nav-index.png
new file mode 100644 (file)
index 0000000..c682387
Binary files /dev/null and b/fluidbook/icones/3/nav-index.png differ

diff --git a/fluidbook/icones/3/nav-normal.png b/fluidbook/icones/3/nav-normal.png
new file mode 100644 (file)
index 0000000..03fe202
Binary files /dev/null and b/fluidbook/icones/3/nav-normal.png differ

diff --git a/fluidbook/icones/3/nav-normalscreen.png b/fluidbook/icones/3/nav-normalscreen.png
new file mode 100644 (file)
index 0000000..0206770
Binary files /dev/null and b/fluidbook/icones/3/nav-normalscreen.png differ

diff --git a/fluidbook/icones/3/nav-print.png b/fluidbook/icones/3/nav-print.png
new file mode 100644 (file)
index 0000000..1592791
Binary files /dev/null and b/fluidbook/icones/3/nav-print.png differ

diff --git a/fluidbook/icones/3/nav-save.png b/fluidbook/icones/3/nav-save.png
new file mode 100644 (file)
index 0000000..d22cd27
Binary files /dev/null and b/fluidbook/icones/3/nav-save.png differ

diff --git a/fluidbook/icones/3/nav-sommaire.png b/fluidbook/icones/3/nav-sommaire.png
new file mode 100644 (file)
index 0000000..5e3ce71
Binary files /dev/null and b/fluidbook/icones/3/nav-sommaire.png differ

diff --git a/fluidbook/icones/3/nav-soundoff.png b/fluidbook/icones/3/nav-soundoff.png
new file mode 100644 (file)
index 0000000..67a76fd
Binary files /dev/null and b/fluidbook/icones/3/nav-soundoff.png differ

diff --git a/fluidbook/icones/3/nav-soundon.png b/fluidbook/icones/3/nav-soundon.png
new file mode 100644 (file)
index 0000000..47bc019
Binary files /dev/null and b/fluidbook/icones/3/nav-soundon.png differ

diff --git a/fluidbook/icones/3/nav-zoomin.png b/fluidbook/icones/3/nav-zoomin.png
new file mode 100644 (file)
index 0000000..c2effa4
Binary files /dev/null and b/fluidbook/icones/3/nav-zoomin.png differ

diff --git a/fluidbook/icones/3/nav-zoomout.png b/fluidbook/icones/3/nav-zoomout.png
new file mode 100644 (file)
index 0000000..bc05b8a
Binary files /dev/null and b/fluidbook/icones/3/nav-zoomout.png differ

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index d4db169635a260a1c29c9e78c4b7742a3861978b..65b46e23156a6d0bddf501b29bf66795379ff588 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -60,8 +60,9 @@ class wsBookParametres extends wsParametres {
                $this->fields['print'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Activer l'impression"));\r
                $this->fields['bookmark'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer les marques-pages'));\r
                $this->fields['fullscreen'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer le mode plein-écran'));\r
+               $this->fields['help'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Activer l'aide"));\r
                $this->forms['general'] = array('label' => __('Fonctionnalités générales'),\r
-                       'fieldsnames' => array('print', 'bookmark', 'fullscreen', 'pages', 'width', 'height'));\r
+                       'fieldsnames' => array('print', 'bookmark', 'fullscreen','help', 'pages', 'width', 'height'));\r
                // .\r
                // \r
                $this->fields['search'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer le moteur de recherche'));\r

diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index 8143d8e79903a5b7edaa65ab961a87ee5c848f96..54546eec6b7cf49d0c9d997a4a8bfe72b09b620d 100644 (file)
--- a/inc/ws/Metier/class.ws.theme.parametres.php
+++ b/inc/ws/Metier/class.ws.theme.parametres.php
@@ -19,9 +19,10 @@ class wsThemeParametres extends wsParametres {
                        'label' => __("Couleur de fond"));\r
                $this->fields['arrowsColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
                        'label' => __('Couleur des flèches'));\r
+               $this->fields['shadeOnArrows'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Ombre portée sous les flèches'));\r
 \r
                $this->forms['bouton'] = array('label' => __('Personnalisation des boutons'),\r
-                       'fieldsnames' => array('couleurA', 'arrowsColor'));\r
+                       'fieldsnames' => array('couleurA', 'arrowsColor', 'shadeOnArrows'));\r
                /* Submenus */\r
                $this->fields['couleurB'] = array('type' => 'couleurAlpha', 'default' => 'ff000000', 'editable' => true,\r
                        'label' => __("Couleur de fond"));\r