Changeset 539

Timestamp:

01/15/10 10:20:16 (2 years ago)

Author:

juw

Message:

merge avant passage en 3.7 du trunk

Location:

branches/sc36

Files:

• . (modified) (1 prop)
• deriver/overwrite/sources/dokielGuide/dist/_res/postpack/DokielGuide.dmgCanvas (deleted)
• deriver/overwrite/sources/dokielGuide/dist/en/_res (copied) (copied from trunk/deriver/overwrite/sources/dokielGuide/dist/en/_res)
• deriver/overwrite/sources/dokielGuide/dist/en/_res/DokielGuide.dmgCanvas (copied) (copied from trunk/deriver/overwrite/sources/dokielGuide/dist/en/_res/DokielGuide.dmgCanvas)
• deriver/overwrite/sources/dokielGuide/dist/es/_res/DokielGuide.dmgCanvas (copied) (copied from trunk/deriver/overwrite/sources/dokielGuide/dist/es/_res/DokielGuide.dmgCanvas)
• deriver/overwrite/sources/dokielGuide/dist/es/dokielGuide.wspmake (modified) (1 diff)
• model/sources/dkCore/genSld/wdt/mgr/scPresMgr.doss/scPresMgr.js (modified) (19 diffs)
• model/sources/dkCore/genSld/wdt/mgr/scSlideMgr.doss/scSlideMgr.js (modified) (9 diffs)
• model/sources/dkCore/genWeb/wdt/imgZoom.doss/imgZoomMgr.js (modified) (1 diff)
• model/sources/dokielGuide/dist/_res/postpack/DokielGuide.dmgCanvas (deleted)
• model/sources/dokielGuide/dist/en/_res (copied) (copied from trunk/model/sources/dokielGuide/dist/en/_res)
• model/sources/dokielGuide/dist/en/_res/DokielGuide.dmgCanvas (copied) (copied from trunk/model/sources/dokielGuide/dist/en/_res/DokielGuide.dmgCanvas)
• model/sources/dokielGuide/dist/es/_res/DokielGuide.dmgCanvas (copied) (copied from trunk/model/sources/dokielGuide/dist/es/_res/DokielGuide.dmgCanvas)
• model/sources/dokielGuide/dist/es/dokielGuide.wspmake (modified) (1 diff)

branches/sc36/deriver/overwrite/sources/dokielGuide/dist/es/dokielGuide.wspmake

@@ -3 +3 @@
         <sm:wspDef sc:refUri="/dokielGuide/dokielGuide.wspdef"/>
         <sm:localization defaultLang="en-US" targetLang="es-ES">
+                <sm:modeling>
+                        <sm:locale sc:refUri="/dokielGuide/dist/es/_res/modeling.locale"/>
+                </sm:modeling>
                 <sm:model>
                         <sm:locale sc:refUri="/dokielGuide/dist/es/model.locale"/>

branches/sc36/model/sources/dkCore/genSld/wdt/mgr/scPresMgr.doss/scPresMgr.js

@@ -46 +46 @@
         fSldFraPath : null,
         fNavPath : null,
-        
+        fToolsPath : null,
+
         /* Paths standards. */
         fContainerFilter : ".ssContainer",
@@ -91 +92 @@
                     "next","next (right arrow)",                  //2
                     "close","close the zoom (ESC)",               //4
-                    "WARNING: The Firebug extention is active.\nIt is advisable to deactivate Firebug while viewing this slide-show.","WARNING: This slide-show is not compatible with Internet Explorer 6.\nPlease use a more recent browser."],//6
+                    "WARNING: The Firebug extention is active.\nIt is advisable to deactivate Firebug while viewing this slide-show.","WARNING: This slide-show is not compatible with Internet Explorer 6.\nPlease use a more recent browser.",//6
+                    "HTML mode","Switch to plain HTML mode (H)", //8
+                    "Are you shure you want to switch to a plain HTML version of this slide-show?","Effects", //10
+                    "Activate visual effects (F)","Deactivate visual effects (F)"], //12
                     fr:["Précédant","Précédant (flèche gauche)",
                     "Suivant","Suivant (flèche droite)",
                     "Fermer","Fermer le zoom (ESC)",
-                    "ATTENTION : L'extension Firebug est actif.\nIl est conseillé de désactiver Firebug pour visualiser ce diaporama.","ATTENTION : Ce diaporama n'est pas compatible avec Internet Explorer 6.\nVeuillez utiliser un navigateur plus récent."],
+                    "ATTENTION : L'extension Firebug est actif.\nIl est conseillé de désactiver Firebug pour visualiser ce diaporama.","ATTENTION : Ce diaporama n'est pas compatible avec Internet Explorer 6.\nVeuillez utiliser un navigateur plus récent.",
+                    "Mode HTML","Basculer en mode HTML simple (H)",
+                    "Etes-vous sûr de vouloir basculer vers une version HTML simple de ce diaporama ?","Effets",
+                    "Activer les effets visuels (F)","Désactiver les effets visuels (F)"],
                     es:["anterior","anterior (flecha izquierda)",
-              "siguiente","siguiente (flecha derecha)",
-              "cerrar","cerrar el zoom (ESC)",
-              "ATENCIÓN: La extensión Firebug esta activa.\nSe recomienda desactivar Firebug mientras consulte esa presentación","ATENCIÓN : Esta presentación con diapositivas no es compatible con Internet Explorer 6.\nPor favor utilice un navegador más reciente."]
+                    "siguiente","siguiente (flecha derecha)",
+                    "cerrar","cerrar el zoom (ESC)",
+                    "ATENCIÓN: La extensión Firebug esta activa.\nSe recomienda desactivar Firebug mientras consulte esa presentación","ATENCIÓN : Esta presentación con diapositivas no es compatible con Internet Explorer 6.\nPor favor utilice un navegador más reciente.",
+                     "Modo HTML","Pasar en modo HTML simple (H)",
+                    "¿ Está seguro de querer pasar a la versión simple HTML de este diaporama ?","Efectos",
+                    "Activar los efectos visuales (F)","Desactivar los efectos visuales (F)"]
                     },
         fNavie6 : parseFloat(scCoLib.userAgent.substring(scCoLib.userAgent.indexOf("msie")+5)) < 7,
@@ -111 +121 @@
         init : function(pSldFraPath, pNavPath, pTocLnksPath) {
                 //scCoLib.util.log("scPresMgr.init");
+                if (window.location.search.indexOf("mode=html")>-1) return;
                 if (this.fNavie6){ // Slideshow mode not compatible with IE6.
                         if(document.cookie.indexOf("ie6Warn=true")<0) alert(this.xGetStr(7));
@@ -151 +162 @@
                 this.fBlkCoPath = pBlkCoPath;
         },
+        /** Set path of optional tools element (if defined extra buttons will be added such as the ability to switch to HTML mode). */
+        setToolsPath : function(pToolsPath) {
+                this.fToolsPath = pToolsPath;
+        },
         /** Set paths of elements that constitute the zoom frame. */
         setZoomPaths : function(pZoomFramePath,pZoomContentPath) {
@@ -172 +187 @@
         enableEffects : function(pEnable) {
                 this.fEnableEffects = pEnable;
+                if (this.fBtnEfcts) this.fBtnEfcts.style.display = (this.fEnableEffects ? "none" : "");
+                if (this.fBtnNoEfcts) this.fBtnNoEfcts.style.display = (this.fEnableEffects ? "" : "none");
         },
         /** Enable / Disable visual effects */
         toggleEffects : function() {
-                this.fEnableEffects = ! this.fEnableEffects;
+                this.enableEffects(!this.fEnableEffects);
         },
         /** register a node as a tool (auto hidden elements). */
@@ -198 +215 @@
                         this.fTocLnks = scPaLib.findNodes(this.fTocLnksPath);
                         this.fBtnHome = this.fTocLnks.shift();
-                        this.fBtnHome.href = "#";
-                        this.fBtnHome.onclick = function(){scPresMgr.loadSld(-1);};
+                        this.fBtnHome.onclick = function(){scPresMgr.loadSld(-1);return false;};
                         this.fSldUrls = [];
                         for (var i=0; i < this.fTocLnks.length; i++){
-                                this.fSldUrls[i] = this.fTocLnks[i].href;
-                                this.fTocLnks[i].href = "#";
-                                this.fTocLnks[i].fSldIdx = i;
-                                this.fTocLnks[i].onclick = this.sOnClickTocLnk;
+                                var vLnk = this.fTocLnks[i];
+                                this.fSldUrls[i] = vLnk.protocol + "//" + (vLnk.hostname ? vLnk.hostname : "") + (vLnk.port ? ":" + vLnk.port : "") + (vLnk.pathname.indexOf("/")!=0 ? "/" : "") + vLnk.pathname;
+                                vLnk.fSldIdx = i;
+                                vLnk.onclick = this.sOnClickTocLnk;
                         }
                         //Init events
@@ -227 +243 @@
                         this.fSldHome.fSldMgr = new scPresMgr.SldHomeMgr(this.fSldHome);
                         this.fSldHome.fSldMgr.initSld();
+                        //Init optional tools 
+                        if (this.fToolsPath){
+                                this.fTools = scPaLib.findNode(this.fToolsPath);
+                                this.fTools.innerHTML = ""; // Purge the tools bar
+                                this.fBtnModeHtml = this.xAddBtn(this.fTools, "btnModeHtml", this.xGetStr(8), this.xGetStr(9));
+                                this.fBtnEfcts = this.xAddBtn(this.fTools, "btnEfcts", this.xGetStr(11), this.xGetStr(12));
+                                this.fBtnEfcts.style.display = (this.fEnableEffects ? "none" : "");
+                                this.fBtnNoEfcts = this.xAddBtn(this.fTools, "btnNoEfcts", this.xGetStr(11), this.xGetStr(13));
+                                this.fBtnNoEfcts.style.display = (this.fEnableEffects ? "" : "none");
+                                this.addToolElt(this.fTools);
+                        }
                         //Init zoom container
                         this.fZoom = (this.fZoomFramePath ? scPaLib.findNode(this.fZoomFramePath) : this.xAddElt("div", document.body, null));
@@ -244 +271 @@
                         //Affichage du slide d'accueil (rendu instantanné)
                         this.fSwitchSldTask.initTask(this.fSldHome, "first", true);
-//                      this.xUpdateSldPosStyledElts();
                         if (!scCoLib.fDebug && window.console && window.console.firebug) alert(this.xGetStr(6));
                 }catch(e){scCoLib.util.logError("ERROR scPresMgr.onLoad : ", e);}
@@ -338 +364 @@
         /** xUpdateGui */
         xUpdateGui : function() {
+                scCoLib.util.log("scPresMgr.xUpdateGui");
                 var vSld = this.getCurrSld();
                 if (vSld && vSld.fSldMgr) {
@@ -343 +370 @@
                         this.fBtnPrv.style.visibility = (vSld.fSldMgr.hasPrv() ? "" : (!vSld.fSldMgr.isFirstSld() ? "" : "hidden"));
                 }
+//              window.setTimeout(function(){scPresMgr.xUpdateSldPosStyledElts()},1000);
                 this.xUpdateSldPosStyledElts();
         },
@@ -352 +380 @@
                         for (var i in this.fSldPosStyledElts){
                                 var vNewClass = this.fSldPosStyledElts[i].fBaseClass + (vSld.fSldMgr.isFirstSld() ? " "+this.fSsClassPrefix+"FirstSlide" + (!vSld.fSldMgr.hasPrv() ? " "+this.fSsClassPrefix+"FirstStep" : "") : (vSld.fSldMgr.isLastSld() ? " "+this.fSsClassPrefix+"LastSlide" + (!vSld.fSldMgr.hasNxt() ? " "+this.fSsClassPrefix+"LastStep" : "") : ""));
-//                              var vNewClass = this.fSldPosStyledElts[i].fBaseClass + (vSld.fSldMgr.isFirstSld() ? " "+this.fSsClassPrefix+"FirstSlide" + (!vSld.fSldMgr.hasPrv() ? " "+this.fSsClassPrefix+"FirstStep" : "") : "");
                                 if (this.fSldPosStyledElts[i].className != vNewClass) this.fSldPosStyledElts[i].className = vNewClass;
                         }
@@ -391 +418 @@
                                                 //Trouvé
                                                 scPresMgr.fSwitchSldTask.initTask(vSld, pFromStart? "first" : "last", pInstantResult);
-//                                              this.xUpdateSldPosStyledElts();
                                                 return true;
                                         }
@@ -399 +425 @@
                                 scPresMgr.fSwitchSldTask.initTask(this.xBuildSlide(pIdx), pFromStart? "first" : "last", pInstantResult);
                         }
-//                      this.xUpdateSldPosStyledElts();
                         return true;
                 }catch(e){scCoLib.util.logError("ERROR scPresMgr.xGotoSlide: ",e);}
@@ -458 +483 @@
                         case "btnZmCls":
                                 this.xHideZoom();break;
+                        case "btnModeHtml":
+                                this.xSwitchToHtmlMode();break;
+                        case "btnEfcts":
+                                this.enableEffects(true);break;
+                        case "btnNoEfcts":
+                                this.enableEffects(false);break;
                 }
                 this.xResetFocus();
@@ -492 +523 @@
                         case 27://escape
                                 this.xHideZoom();return false;
-                }
+                        case 72://h
+                                return this.xSwitchToHtmlMode();
+                }
+        },
+        xSwitchToHtmlMode : function(){
+                var vAsw = confirm( this.xGetStr(10));
+                if (vAsw){
+                        var vLoc = window.location;
+                        window.location.href = vLoc.protocol + "//" + (vLoc.hostname ? vLoc.hostname : "") + (vLoc.port ? ":" + vLoc.port : "") + (vLoc.pathname.indexOf("/")!=0 ? "/" : "") + vLoc.pathname + "?mode=html";
+                }
+                return false;
         },
         /** scPresMgr.xShowZoom : display the zoom window
@@ -635 +676 @@
         /** scPresMgr.sFadeEltStart */
         sFadeEltStart : function(){
-                var vBkColor = scPresMgr.xReadStyle(scPresMgr.fSldFra, "backgroundColor") || "white";
+                var vBkColor = scPresMgr.xReadStyle(this.fElt, "backgroundColor") || scPresMgr.xReadStyle(scPresMgr.fSldFra, "backgroundColor") || "white";
                 if (scCoLib.isIE) this.fElt.style.backgroundColor = (vBkColor == "transparent" ? "white" : vBkColor);
         },
@@ -695 +736 @@
         xReadStyle : function(pElt, pProp) {
                 try {
+                        var vVal = null;
                         if (pElt.style[pProp]) {
-                                return pElt.style[pProp];
+                                vVal = pElt.style[pProp];
                         } else if (pElt.currentStyle) {
-                                return pElt.currentStyle[pProp];
+                                vVal = pElt.currentStyle[pProp];
                         } else {
                                 var vDefaultView = pElt.ownerDocument.defaultView;
                                 if (vDefaultView && vDefaultView.getComputedStyle) {
                                         var vStyle = vDefaultView.getComputedStyle(pElt, null);
-                                        if (vStyle[pProp]) return vStyle[pProp];
-                                        else return vStyle.getPropertyValue(pProp);
+                                        var vProp = pProp.replace(/([A-Z])/g,"-$1").toLowerCase();
+                                        if (vStyle[vProp]) return vStyle[vProp];
+                                        else vVal = vStyle.getPropertyValue(vProp);
                                 }
-                                return null;
-                        }
+                        }
+                        return vVal.replace(/\"/g,""); //Opera returns certain values quoted (literal colors).
                 } catch (e) {
                         return null;
@@ -762 +805 @@
                 var vLang = navigator.userLanguage || navigator.language;
                 vLang = vLang.slice(0,2).toLowerCase();
-                if (this.fStrings[vLang])       return this.fStrings[vLang][pStrId];
+                if (this.fStrings[vLang] && this.fStrings[vLang][pStrId])       return this.fStrings[vLang][pStrId];
                 else return this.fStrings["en"][pStrId];
         },
@@ -1545 +1588 @@
         //On crée autant de masks que de steps
         var vBgColor = scPresMgr.xReadStyle(this.fBlkContent, "backgroundColor") || "white";
-        if(vBgColor=="transparent") vBgColor = scPresMgr.xReadStyle(this.fBlkNode, "backgroundColor") || "white";
-        if(vBgColor=="transparent") vBgColor = "white";
+        if(vBgColor=="transparent" || vBgColor.search(/rgba\([0-9 ]*,[0-9 ]*,[0-9 ]*,\s?0\s?\)/)>-1) vBgColor = scPresMgr.xReadStyle(this.fBlkNode, "backgroundColor") || "white";
+        if(vBgColor=="transparent" || vBgColor.search(/rgba\([0-9 ]*,[0-9 ]*,[0-9 ]*,\s?0\s?\)/)>-1) vBgColor = "white";
         for(var i = this.fMasks.length; i < this.fSteps.length; i++) {
                 this.fMasks[i] = this.xCreateMask(vBgColor);

branches/sc36/model/sources/dkCore/genSld/wdt/mgr/scSlideMgr.doss/scSlideMgr.js

@@ -45 +45 @@
         fDefaultAnimStep : 5000,
         fBlocksPath : "des:.ssBkRoot",
+        fStrings : {en:["previous","previous image",                   //0
+                    "next","next image",                               //2
+                    "play","play the animation",                       //4
+                    "pause","pause the animation"],                    //6
+               fr:["précédant","previous image",
+                     "suivant","next image",
+                     "lancer","lancer l'animation",
+                     "arrêter","arrêter l'animation"],
+               es:["anterior","imagen anterior",
+                     "siguiente","imagen siguiente",
+                     "arrancar","arrancar la animación",
+                     "parar","parar la animación"]},
+        fSsClassPrefix : "sld",
         
         /* === Public ============================================================= */
@@ -169 +182 @@
                 for (var i in vCols) if(vCols[i].fDefaultWidth) vCols[i].width = Math.round(this.fRatioNormalScreen * vCols[i].fDefaultWidth);
         },
+
+        /* === Utilities ========================================================== */
+        /** scSlideMgr.xAddElt : Add an HTML element to a parent node. */
+        xAddElt : function(pName, pParent, pClassName, pNoDisplay, pHidden, pNxtSib){
+                return window.parent.scPresMgr.xAddElt(pName, pParent, pClassName, pNoDisplay, pHidden, pNxtSib);
+        },
+        /** scSlideMgr.xAddBtn : Add a HTML button to a parent node. */
+        xAddBtn : function(pParent, pMgr, pClassName, pFunc, pCapt, pTitle, pNxtSib) {
+                var vBtn = pParent.ownerDocument.createElement("a");
+                vBtn.className = pClassName;
+                vBtn.fName = pClassName;
+                vBtn.href = "#";
+                vBtn.target = "_self";
+                vBtn.onclick = pFunc;
+                vBtn.setAttribute("title", pTitle);
+                vBtn.innerHTML = "<span>" + pCapt + "</span>"
+                vBtn.fMgr = pMgr;
+                if (pNxtSib) pParent.insertBefore(vBtn,pNxtSib)
+                else pParent.appendChild(vBtn);
+                return vBtn;
+        },
         /** Set the opacity of a given node.
          * @param pRate Variable de 0 à 1.
          */
         xSetOpacity: function(pNode, pRate){
-                if(scCoLib.isIE) pNode.filters.item("DXImageTransform.Microsoft.Alpha").opacity = pRate*100;
-                else pNode.style.opacity = pRate;
+                window.parent.scPresMgr.xSetOpacity(pNode, pRate);
         },
         /** Start the opacity of a given node.
@@ -182 +215 @@
          */
         xStartOpacityEffect: function(pNode, pRate){
-                if(scCoLib.isIE) pNode.style.filter = pRate==1 ? "progid:DXImageTransform.Microsoft.Alpha(opacity=100)" : "progid:DXImageTransform.Microsoft.Alpha(opacity=0)";
-                else pNode.style.opacity = pRate;
-                pNode.style.visibility = "";
+                window.parent.scPresMgr.xStartOpacityEffect(pNode, pRate);
         },
         /** End the opacity of a given node.
@@ -192 +223 @@
          */
         xEndOpacityEffect: function(pNode, pRate){
-                if(scCoLib.isIE) pNode.style.filter = "";
-                else pNode.style.opacity = pRate;
-                if(pRate == 0) pNode.style.visibility = "hidden";
-                else pNode.style.visibility = "";
-        },
-        /** scPresMgr.xReadStyle : Read a style property (inline or CSS). */
+                window.parent.scPresMgr.xEndOpacityEffect(pNode, pRate);
+        },
+        /** Reteive a localized string. */
+        xGetStr: function(pStrId) {
+                var vLang = navigator.userLanguage || navigator.language;
+                vLang = vLang.slice(0,2).toLowerCase();
+                if (this.fStrings[vLang])       return this.fStrings[vLang][pStrId];
+                else return this.fStrings["en"][pStrId];
+        },
+        /** scSlideMgr.xReadStyle : Read a style property (inline or CSS). */
         xReadStyle : function(pElt, pProp, pDoc) {
                 var vDoc = pDoc || document;
-                try {
-                        if (pElt.style[pProp]) {
-                                return pElt.style[pProp];
-                        } else if (pElt.currentStyle) {
-                                return pElt.currentStyle[pProp];
-                        } else if (vDoc.defaultView && vDoc.defaultView.getComputedStyle) {
-                                var style = vDoc.defaultView.getComputedStyle(pElt, null);
-                                if (style[pProp]) return style[pProp];
-                                else return style.getPropertyValue(pProp);
-                        } else {
-                                return null;
-                        }
-                } catch (e) {
-                        return null;
-                }
+                return window.parent.scPresMgr.xEndOpacityEffect(pElt, pProp, vDoc);
         }
 }
@@ -234 +255 @@
         }
         this.fCurrImg = this.fImgs[0];
+        this.fNxtImg = this.fCurrImg.fNxtImg;
         scSlideMgr.xStartOpacityEffect(this.fCurrImg, 1);
-        scSlideMgr.xStartOpacityEffect(this.fCurrImg.fNxtImg, 0);
+        scSlideMgr.xStartOpacityEffect(this.fNxtImg, 0);
         pElt.fImgs = this.fImgs;
         pElt.style.width="100%";
+
+        pElt.fCtrl = scSlideMgr.xAddElt("div",pElt,scSlideMgr.fSsClassPrefix + "AnmCtrl");
+        pElt.fBtnPrv = scSlideMgr.xAddBtn(pElt.fCtrl,this,scSlideMgr.fSsClassPrefix+"AnmBtnPrv",this.btnPrv,scSlideMgr.xGetStr(0),scSlideMgr.xGetStr(1));
+        pElt.fBtnPly = scSlideMgr.xAddBtn(pElt.fCtrl,this,scSlideMgr.fSsClassPrefix+"AnmBtnPly",this.btnPly,scSlideMgr.xGetStr(4),scSlideMgr.xGetStr(5));
+        pElt.fBtnPly.style.display = "none";
+        pElt.fBtnPse = scSlideMgr.xAddBtn(pElt.fCtrl,this,scSlideMgr.fSsClassPrefix+"AnmBtnPse",this.btnPse,scSlideMgr.xGetStr(6),scSlideMgr.xGetStr(7));
+        pElt.fBtnNxt = scSlideMgr.xAddBtn(pElt.fCtrl,this,scSlideMgr.fSsClassPrefix+"AnmBtnNxt",this.btnNxt,scSlideMgr.xGetStr(2),scSlideMgr.xGetStr(3));
+        pElt.fCtrl.style.visibility = "hidden";
+        pElt.fCtrl.fOn = false;
+        pElt.onmouseover = this.showCtrl;
+        pElt.fMgr = this;
+        this.fElt = pElt;
+        this.fPlyMode = 2;
+        this.fNxtPlyMode = 2;
         scSiLib.addRule(pElt, this);
         scTiLib.addTaskAfterAll(this);
@@ -260 +296 @@
         }
 }
+scSlideMgr.SldAnimBlk.prototype.btnPrv = function(){
+        var vMgr = this.fMgr;
+        vMgr.fNxtPlyMode = -1;
+        var vAnim = vMgr.fElt;
+        vAnim.fBtnPly.style.display="";
+        vAnim.fBtnPse.style.display="none";
+}
+scSlideMgr.SldAnimBlk.prototype.btnPly = function(){
+        var vMgr = this.fMgr;
+        vMgr.fNxtPlyMode = 2;
+        var vAnim = vMgr.fElt;
+        vAnim.fBtnPly.style.display="none";
+        vAnim.fBtnPse.style.display="";
+}
+scSlideMgr.SldAnimBlk.prototype.btnPse = function(){
+        var vMgr = this.fMgr;
+        vMgr.fNxtPlyMode = 0;
+        var vAnim = vMgr.fElt;
+        vAnim.fBtnPly.style.display="";
+        vAnim.fBtnPse.style.display="none";
+}
+scSlideMgr.SldAnimBlk.prototype.btnNxt = function(){
+        var vMgr = this.fMgr;
+        vMgr.fNxtPlyMode = 1;
+        var vAnim = vMgr.fElt;
+        vAnim.fBtnPly.style.display="";
+        vAnim.fBtnPse.style.display="none";
+}
+scSlideMgr.SldAnimBlk.prototype.showCtrl = function(){
+        if (this.fOffProc) window.clearTimeout(this.fOffProc);
+        if (!this.fCtrl.fOn){
+                new window.parent.scPresMgr.FadeEltTask(this.fCtrl, 1);
+                this.fCtrl.fOn = true;
+        }
+        var vAnm = this;
+        this.fOffProc = window.setTimeout(function(){vAnm.fMgr.hideCtrl()}, 3000);
+}
+scSlideMgr.SldAnimBlk.prototype.hideCtrl = function(){
+        if (this.fElt.fCtrl.fOn){
+                new window.parent.scPresMgr.FadeEltTask(this.fElt.fCtrl, 0);
+                this.fElt.fCtrl.fOn = false;
+                this.fElt.fOffProc = null;
+        }
+}
+scSlideMgr.SldAnimBlk.prototype.setNxtPlyMode = function(){
+        var vNow = (Date.now ? Date.now() : new Date().getTime());
+        var vAddTempo = (this.fPlyMode == 2 && this.fNxtPlyMode == 2);
+        this.fPlyMode = this.fNxtPlyMode;
+        this.fNxtPlyMode = (this.fPlyMode != 2 ? 0 : 2);
+        if (this.fPlyMode != 0) {
+                this.fNxtSwitchTime = vNow + (vAddTempo ? scSlideMgr.fDefaultAnimStep : 0);
+                this.fEndTime = this.fNxtSwitchTime + 100;
+                this.fNxtImg = (this.fPlyMode < 0 ? this.fCurrImg.fPrvImg : this.fCurrImg.fNxtImg);
+        }
+}
 scSlideMgr.SldAnimBlk.prototype.execTask = function(){
         try{
                 var vNow = (Date.now ? Date.now() : new Date().getTime());
-                if(this.fNxtSwitchTime < vNow){
+                if(this.fPlyMode != 0 && this.fNxtSwitchTime < vNow){
+                        if (this.fIdx < 0) {
+                                scSlideMgr.xStartOpacityEffect(this.fCurrImg, 1);
+                                scSlideMgr.xStartOpacityEffect(this.fNxtImg, 0);
+                        }
                         while(this.fEndTime < vNow && this.fIdx < this.fRateOld.length) {
                                 this.fIdx++;
@@ -272 +367 @@
                         if(this.fIdx >= this.fRateOld.length) {
                                 scSlideMgr.xEndOpacityEffect(this.fCurrImg, 0);
-                                scSlideMgr.xSetOpacity(this.fCurrImg.fNxtImg, 1);
-                                this.fCurrImg = this.fCurrImg.fNxtImg;
-                                scSlideMgr.xStartOpacityEffect(this.fCurrImg.fNxtImg, 0);
-                                this.fNxtSwitchTime = vNow + scSlideMgr.fDefaultAnimStep;
+                                scSlideMgr.xEndOpacityEffect(this.fNxtImg, 1);
+                                this.fCurrImg = this.fNxtImg;
                                 this.fIdx = -1;
-                                this.fEndTime = this.fNxtSwitchTime + 100;
+                                this.setNxtPlyMode();
                                 return true;
                         }
-                                scCoLib.util.log(" scSlideMgr.SldAnimBlk.onResizedAnc fIdx : "+this.fIdx);
                         scSlideMgr.xSetOpacity(this.fCurrImg, this.fRateOld[this.fIdx]);
-                        scSlideMgr.xSetOpacity(this.fCurrImg.fNxtImg, this.fRateNew[this.fIdx]);
-                }
+                        scSlideMgr.xSetOpacity(this.fNxtImg, this.fRateNew[this.fIdx]);
+                } else if (this.fPlyMode != this.fNxtPlyMode) this.setNxtPlyMode();
         }catch(e){
                 scCoLib.util.logError("ERROR scSlideMgr.SldAnimBlk.execTask : ", e);
@@ -396 +488 @@
                 onResizedAnc : function(pOwnerNode, pEvent) {
                         if(pEvent && pEvent.phase==2) return;
-                        var vRate = scSlideMgr.getRatioNormalScreen() * 1.25; //On force un 25% de plus pour le zoom.
+                        var vRate = scSlideMgr.getRatioNormalScreen() * 1.3; //On force un 30% de plus pour le zoom.
                         var vWantedW = vBlk.fOriW * vRate;
                         var vWantedH = vBlk.fOriH * vRate;
@@ -488 +580 @@
                 onResizedAnc : function(pOwnerNode, pEvent) {
                         if(pEvent && pEvent.phase==2) return;
-                        var vRate = scSlideMgr.getRatioNormalScreen() * 1.25; //On force un 25% de plus pour le zoom.
+                        var vRate = scSlideMgr.getRatioNormalScreen() * 1.3; //On force un 30% de plus pour le zoom.
                         var vWantedW = vBlk.fObj.oriW * vRate;
                         var vWantedH = vBlk.fObj.oriH * vRate;

branches/sc36/model/sources/dkCore/genWeb/wdt/imgZoom.doss/imgZoomMgr.js

@@ -305 +305 @@
  */
 imgZoomMgr.xReadStyle = function(pElt, pProp) {
-        if (pElt.style[pProp]) {
-                return pElt.style[pProp];
-        } else if (pElt.currentStyle) {
-                return pElt.currentStyle[pProp];
-        } else if (document.defaultView && document.defaultView.getComputedStyle) {
-                var vStyle = document.defaultView.getComputedStyle(pElt, null);
-                if (vStyle[pProp]) return vStyle[pProp];
-                else return vStyle.getPropertyValue(pProp);
-        } else {
-                return null
+        try {
+                var vVal = null;
+                if (pElt.style[pProp]) {
+                        vVal = pElt.style[pProp];
+                } else if (pElt.currentStyle) {
+                        vVal = pElt.currentStyle[pProp];
+                } else {
+                        var vDefaultView = pElt.ownerDocument.defaultView;
+                        if (vDefaultView && vDefaultView.getComputedStyle) {
+                                var vStyle = vDefaultView.getComputedStyle(pElt, null);
+                                var vProp = pProp.replace(/([A-Z])/g,"-$1").toLowerCase();
+                                if (vStyle[vProp]) return vStyle[vProp];
+                                else vVal = vStyle.getPropertyValue(vProp);
+                        }
+                }
+                return vVal.replace(/\"/g,""); //Opera returns certain values quoted (literal colors).
+        } catch (e) {
+                return null;
         }
 }

branches/sc36/model/sources/dokielGuide/dist/es/dokielGuide.wspmake

@@ -3 +3 @@
         <sm:wspDef sc:refUri="/dokielGuide/dokielGuide.wspdef"/>
         <sm:localization defaultLang="en-US" targetLang="es-ES">
+                <sm:modeling>
+                        <sm:locale sc:refUri="/dokielGuide/dist/es/_res/modeling.locale"/>
+                </sm:modeling>
                 <sm:model>
                         <sm:locale sc:refUri="/dokielGuide/dist/es/model.locale"/>