From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 10 Dec 2012 11:29:34 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=f1f651d002e11f8e6584715d7cd3581567afa50a;p=cubeextranet.git

---

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 1beb811cf..fa76955a7 100644
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -88,14 +88,14 @@ class wsBookParametres extends wsParametres {
 		$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', 'navOrder', 'pages', 'width', 'height'));
+			'fieldsnames' => array('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'));
+			'fieldsnames' => array('bookmark','bookmarkCorner'));
 
 		$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"));
diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index c08aa56b9..7bcdc95fb 100644
--- a/inc/ws/Metier/class.ws.theme.parametres.php
+++ b/inc/ws/Metier/class.ws.theme.parametres.php
@@ -119,7 +119,7 @@ class wsThemeParametres extends wsParametres {
 			'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,
+		$this->fields['bookmarkStarEnabledColor'] = array('type' => 'couleur', 'default' => 'ff7700', 'editable' => true,
 			'label' => __("Couleur de l'étoile activée"));
 
 		$this->forms['book'] = array('label' => __('Personnalisation du fluidbook'),
@@ -129,7 +129,7 @@ class wsThemeParametres extends wsParametres {
 				'|', 'displayPageNumber', 'colorPageNumber',
 				'|', 'linksColor', 'videoBackgroundColor', 'popupVideoOverlay',
 				'|', 'tooltipBackColor', 'tooltipTextColor',
-				'|', 'bookmarkBackgroundColor', 'bookmarkStarDisabledColor', 'bookmakrStarEnabledColor'));
+				'|', 'bookmarkBackgroundColor', 'bookmarkStarDisabledColor', 'bookmarkStarEnabledColor'));
 		/* Credits */
 		$this->fields['creditsColor'] = array('type' => 'couleurAlpha', 'default' => '80ffffff', 'editable' => true,
 			'label' => __("Couleur du texte"));