From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 6 Dec 2012 17:41:14 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=d35cd0f071bdf2eadd63b6704e6be4fe21a5b366;p=cubeextranet.git

---

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 4be748f38..fb316ef1f 100644
--- 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'),
 			'fieldsnames' => array('visualisationMode', 'antialiasReading', 'pagesBaseAngle', 'centerBook', '|', 'extraXSpace', 'extraYSpace', '|', 'viewMode'));
 
-
-		$this->fields['bookmark'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer les marques-pages'));
 		$this->fields['fullscreen'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer le mode plein-écran'));
 		$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);
 		$this->forms['general'] = array('label' => __('Fonctionnalités générales'),
-			'fieldsnames' => array('bookmark', 'fullscreen', 'help', 'navOrder', 'pages', 'width', 'height'));
+			'fieldsnames' => array('bookmark', 'fullscreen', 'navOrder', 'pages', 'width', 'height'));
 		//.
 		//
 		
+		$this->fields['bookmark'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer les marques-pages'));
+		$this->fields['bookmarkCorner'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer les marques-pages sur les coins des pages'));
+		$this->forms['bookmark'] = array('label' => __('Marques-pages'),
+			'fieldsnames' => array('bookmark'));
+
 		$this->fields['help'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Activer l'aide"));
 		$this->fields['helpStartup'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Afficher l'aide au démarrage"));
 		$this->fields['helpStartupTime'] = array('type' => 'integer', 'default' => 15, 'editable' => true, 'label' => __("Temps d'affichage en secondes"));
diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index 2df61748a..c08aa56b9 100644
--- 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"));
 		$this->fields['tooltipTextColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,
 			'label' => __("Couleur du texte des infobulles"));
-
+		$this->fields['bookmarkBackgroundColor'] = array('type' => 'couleurAlpha', 'default' => 'ffdddddd', 'editable' => true,
+			'label' => __("Couleur de fond des marques-pages"));
+		$this->fields['bookmarkStarDisabledColor'] = array('type' => 'couleur', 'default' => 'c7c7c7', 'editable' => true,
+			'label' => __("Couleur de l'étoile désactivée"));
+		$this->fields['bookmakrStarEnabledColor'] = array('type' => 'couleur', 'default' => 'ff7700', 'editable' => true,
+			'label' => __("Couleur de l'étoile activée"));
 
 		$this->forms['book'] = array('label' => __('Personnalisation du fluidbook'),
 			'fieldsnames' => array('pageReflection', 'shadeAlpha',
@@ -123,7 +128,8 @@ class wsThemeParametres extends wsParametres {
 				'|', 'bookShadeColor',
 				'|', 'displayPageNumber', 'colorPageNumber',
 				'|', 'linksColor', 'videoBackgroundColor', 'popupVideoOverlay',
-				'|', 'tooltipBackColor', 'tooltipTextColor'));
+				'|', 'tooltipBackColor', 'tooltipTextColor',
+				'|', 'bookmarkBackgroundColor', 'bookmarkStarDisabledColor', 'bookmakrStarEnabledColor'));
 		/* Credits */
 		$this->fields['creditsColor'] = array('type' => 'couleurAlpha', 'default' => '80ffffff', 'editable' => true,
 			'label' => __("Couleur du texte"));