From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 1 Sep 2011 18:16:55 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=a1929f7b7f93167e293e329bad5fe0c9c2cf04cb;p=cubeextranet.git

---

diff --git a/fluidbook/compile/_js/fluidbook.js b/fluidbook/compile/_js/fluidbook.js
index d594e98bc..7c2bfef25 100644
--- a/fluidbook/compile/_js/fluidbook.js
+++ b/fluidbook/compile/_js/fluidbook.js
@@ -7,6 +7,14 @@ function getWmode(){
 	}
 }
 
+function popup(url,name,width,height,scrollbars,resizable){
+	var newWindow=window.open(url,name,'width='+width+',height='+height+',scrollbars='+scrollbars+',resizable='+resizable);
+	if(newWindow==null || newWindow==undefined){
+		
+	}
+	return;
+}
+
 function getLocation(){
 	return window.location.toString();
 }
@@ -109,44 +117,44 @@ function isMobile(){
 }
 
 function wheel(event){
-        var delta = 0;
-        if (!event) /* For IE. */
-                event = window.event;
-        if (event.wheelDelta) { /* IE/Opera. */
-                delta = event.wheelDelta/120;
-                /** In Opera 9, delta differs in sign as compared to IE.
+	var delta = 0;
+	if (!event) /* For IE. */
+		event = window.event;
+	if (event.wheelDelta) { /* IE/Opera. */
+		delta = event.wheelDelta/120;
+		/** In Opera 9, delta differs in sign as compared to IE.
                  */
-                if (window.opera)
-                        delta = -delta;
-        } else if (event.detail) { /** Mozilla case. */
-                /** In Mozilla, sign of delta is different than in IE.
+		if (window.opera)
+			delta = -delta;
+	} else if (event.detail) { /** Mozilla case. */
+		/** In Mozilla, sign of delta is different than in IE.
                  * Also, delta is multiple of 3.
                  */
-                delta = -event.detail/3;
-        }
-        /** If delta is nonzero, handle it.
+		delta = -event.detail/3;
+	}
+	/** If delta is nonzero, handle it.
          * Basically, delta is now positive if wheel was scrolled up,
          * and negative, if wheel was scrolled down.
          */
-        if (delta){
-        	handleWheel(delta);
-		}
-        /** Prevent default actions caused by mouse wheel.
+	if (delta){
+		handleWheel(delta);
+	}
+	/** Prevent default actions caused by mouse wheel.
          * That might be ugly, but we handle scrolls somehow
          * anyway, so don't bother here..
          */
-        if (event.preventDefault){
-        	event.preventDefault();
-        }
-		event.returnValue = false;
+	if (event.preventDefault){
+		event.preventDefault();
 	}
+	event.returnValue = false;
+}
 
 /** Initialization code.
  * If you use your own event management code, change it as required.
  */
 if (window.addEventListener){
-        /** DOMMouseScroll is for mozilla. */
-        window.addEventListener('DOMMouseScroll', wheel, false);
-    }
+	/** DOMMouseScroll is for mozilla. */
+	window.addEventListener('DOMMouseScroll', wheel, false);
+}
 /** IE/Opera. */
 window.onmousewheel = document.onmousewheel = wheel;
\ No newline at end of file
diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 668abc668..7d224b4e3 100644
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -140,10 +140,11 @@ class wsBookParametres extends wsParametres {
 		$this->forms['sommaire'] = array('label' => __('Sommaire'),
 			'fieldsnames' => array('displayChaptersIcon', 'displayChaptersAtStart', 'chaptersPage', 'chaptersPosition', '|', 'chaptersColMaxWidth', 'chaptersColumns', '|', 'externalChapters', 'fullExternalChapters', '|', 'ongletsSWF', 'ongletsXML'));
 		// .
+		$this->fields['customLinkClass']= array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Classe pour les liens personnalisés'),'grade'=>5);
 		$this->fields['permanentLinks'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Liens visibles en permanence'), 'grade' => 3);
 		$this->fields['linkBlinkTime'] = array('type' => 'float', 'default' => 1.0, 'editable' => true, 'label' => __("Temps d'apparition du lien à l'ouverture de la page (en secondes)"));
 		$this->forms['multimedia'] = array('label' => __('Liens et multimédia'),
-			'fieldsnames' => array('permanentLinks', 'linkBlinkTime'));
+			'fieldsnames' => array('permanentLinks', 'linkBlinkTime','customLinkClass'));
 		// .
 		$this->fields['externalArchives'] = array('type' => 'freefile', 'default' => '', 'editable' => true,
 			'label' => __('Archives'), 'grade' => 3, 'fileFilter' => $swfFilter);