wip #5099 @0.5

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index 9bcfc90e948e74ce3a20bd2f2efd514d18296cb5..4346653b40834202e1eb7165ee8371a281c40236 100644 (file)
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -1143,7 +1143,7 @@ class wsMaintenance
     public static function installWescoVentes()
     {
         $exporter = new wsExporter();
-        $exporter->export(19670, $x, 'install_ftp', 'online', "wescogrolj-catalogca:b9uA7U72eW@ftp.cluster023.hosting.ovh.net", '');
+        $exporter->export(20818, $x, 'install_ftp', 'online', "wescogrolj-catalogca:b9uA7U72eW@ftp.cluster023.hosting.ovh.net", '');
         header('Location: https://agefard:TB6x9gg9@wesco-group.com/download/Catalogues/Wesco_Rapport_ventes_0-12-ans/');
         exit;
     }

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index bbcd2f035ef14bbe4eeeff8c646986f0e1b2325a..b92f27bcc4b5fbbfe01a42f22735e620b1645666 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -310,7 +310,7 @@ class wsBookParametres extends wsParametres
             __('Moyenne') => 'lowPerf',
             __('Basse') => 'veryLowPerf'], 'default' => 'auto', 'editable' => true, 'label' => __('Performance de la 3D'), 'grade' => 1);
         $this->forms['performances'] = ['label' => __('Performances'),
-            'fieldsnames' => ['rasterizeOnSafari','performance3DMode']];
+            'fieldsnames' => ['rasterizeOnSafari', 'performance3DMode']];
 
         $this->fields['maxPages'] = array('type' => 'integer', 'default' => 0, 'editable' => true, 'label' => __("Nombre de pages maximal affiché à l'ouverture du fluidbook (pas de limite = 0)"), 'grade' => 3);
 
@@ -356,6 +356,7 @@ class wsBookParametres extends wsParametres
             'fieldsnames' => array('fullscreen', 'fullscreenAuto'));
 
         $this->fields['bookmark'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer les marques-pages'));
+        $this->fields['bookmarkView'] = array('type' => 'combo', 'datas' => [__('Réduit') => 'small', __('Complet') => 'large'], 'default' => 'small', 'editable' => true, 'label' => __('Menu des marques-pages'));
         $this->fields['bookmarkDisablePages'] = ['type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Désactiver les marques-pages sur ces pages'), 'hint' => '1-3,5 = 1,2,3,5', 'grade' => 1];
         $this->fields['bookmarkSendEnable'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Activer l'envoi des marques-pages par e-mail"));
         $this->fields['bookmark_email_title'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __("Titre de l'email") . ' "' . __('Envoyer à un ami') . '"', 'hint' => __('Laisser vide pour utiliser la valeur par défaut'));
@@ -369,7 +370,7 @@ class wsBookParametres extends wsParametres
                 __('PDF de remplacement') => 'download',
                 __('PDF des miniatures') => 'thumbnails']);
         $this->forms['bookmark'] = array('label' => __('Marques-pages'),
-            'fieldsnames' => array('bookmark', '|', 'bookmarkSendEnable', 'bookmark_email_title', 'bookmark_email_body', '|', 'bookmarkCornerSize', 'bookmarkOffset', 'bookmarkPermanentIcon', 'bookmarkBlinkOnPageChange', '|', 'bookmarkDisablePages', 'bookmarkUsePDF'));
+            'fieldsnames' => array('bookmark', 'bookmarkView', '|', 'bookmarkSendEnable', 'bookmark_email_title', 'bookmark_email_body', '|', 'bookmarkCornerSize', 'bookmarkOffset', 'bookmarkPermanentIcon', 'bookmarkBlinkOnPageChange', '|', 'bookmarkDisablePages', 'bookmarkUsePDF'));
 
         $this->fields['help'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Activer l'aide"));
         $this->fields['helpBookmarks'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Améliorer l'aide des marques-pages"));