(no commit message)

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 4be748f3845453fddc27d1fe75c825d3908e42f7..fb316ef1f9035727d0119fdaac8294c1004df51a 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -85,15 +85,18 @@ class wsBookParametres extends wsParametres {
                $this->forms['3d_mode'] = array('label' => __('Options de visualisation'),\r
                        'fieldsnames' => array('visualisationMode', 'antialiasReading', 'pagesBaseAngle', 'centerBook', '|', 'extraXSpace', 'extraYSpace', '|', 'viewMode'));\r
 \r
-\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['navOrder'] = array('type' => 'textarea', 'default' => 'index, chapters, print, friend, bookmark, pdf, archives, basket, fullscreen, sound, 3d, help', 'editable' => true, 'label' => __('Ordre des icônes dans la nav'), 'grade' => 5);\r
                $this->forms['general'] = array('label' => __('Fonctionnalités générales'),\r
-                       'fieldsnames' => array('bookmark', 'fullscreen', 'help', 'navOrder', 'pages', 'width', 'height'));\r
+                       'fieldsnames' => array('bookmark', 'fullscreen', 'navOrder', 'pages', 'width', 'height'));\r
                //.\r
                //\r
                \r
+               $this->fields['bookmark'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer les marques-pages'));\r
+               $this->fields['bookmarkCorner'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer les marques-pages sur les coins des pages'));\r
+               $this->forms['bookmark'] = array('label' => __('Marques-pages'),\r
+                       'fieldsnames' => array('bookmark'));\r
+\r
                $this->fields['help'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Activer l'aide"));\r
                $this->fields['helpStartup'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Afficher l'aide au démarrage"));\r
                $this->fields['helpStartupTime'] = array('type' => 'integer', 'default' => 15, 'editable' => true, 'label' => __("Temps d'affichage en secondes"));\r

diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index 2df61748aeeb0d2884eaccf7d0ef421a20a15805..c08aa56b9e746694a5a80cdf4e305aa001a68df6 100644 (file)
--- a/inc/ws/Metier/class.ws.theme.parametres.php
+++ b/inc/ws/Metier/class.ws.theme.parametres.php
@@ -115,7 +115,12 @@ class wsThemeParametres extends wsParametres {
                        'label' => __("Couleur de fond des infobulles"));\r
                $this->fields['tooltipTextColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,\r
                        'label' => __("Couleur du texte des infobulles"));\r
-\r
+               $this->fields['bookmarkBackgroundColor'] = array('type' => 'couleurAlpha', 'default' => 'ffdddddd', 'editable' => true,\r
+                       'label' => __("Couleur de fond des marques-pages"));\r
+               $this->fields['bookmarkStarDisabledColor'] = array('type' => 'couleur', 'default' => 'c7c7c7', 'editable' => true,\r
+                       'label' => __("Couleur de l'étoile désactivée"));\r
+               $this->fields['bookmakrStarEnabledColor'] = array('type' => 'couleur', 'default' => 'ff7700', 'editable' => true,\r
+                       'label' => __("Couleur de l'étoile activée"));\r
 \r
                $this->forms['book'] = array('label' => __('Personnalisation du fluidbook'),\r
                        'fieldsnames' => array('pageReflection', 'shadeAlpha',\r
@@ -123,7 +128,8 @@ class wsThemeParametres extends wsParametres {
                                '|', 'bookShadeColor',\r
                                '|', 'displayPageNumber', 'colorPageNumber',\r
                                '|', 'linksColor', 'videoBackgroundColor', 'popupVideoOverlay',\r
-                               '|', 'tooltipBackColor', 'tooltipTextColor'));\r
+                               '|', 'tooltipBackColor', 'tooltipTextColor',\r
+                               '|', 'bookmarkBackgroundColor', 'bookmarkStarDisabledColor', 'bookmakrStarEnabledColor'));\r
                /* Credits */\r
                $this->fields['creditsColor'] = array('type' => 'couleurAlpha', 'default' => '80ffffff', 'editable' => true,\r
                        'label' => __("Couleur du texte"));\r