(no commit message)

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