Changeset 9844 for trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/_common/sm/web/sm_WLink.xml.xsl

Timestamp:

18.10.2007 14:56:29 (2 years ago)

Author:

sam

Message:

* passage à 3.4.002
* binaryXhtmlTransf :

• ajout sm:WFreeBlock
• ajout sm:WFlash
• sur sm:WImage & sm:WFlash : implémentation de sm:size permetant de borner width et height de l'elt html en partant des dim de la res publié
• ajout de sm:chooseOnBinary permetant d'ajouter des conditionnalités de génération en fonction de caractéristiques d'une resource transformé (dims seuls pour le moment)
• sm:WLink :
  • ajout de sm:WImage à sm:link
  • si sm:link/sm:position/sm:centerScreen alors par défaut, pour les res de type image et flash, le popup prend les dimensions de la resource qu'il affiche.

Files:

• trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/_common/sm/web/sm_WLink.xml.xsl (modified) (4 diffs)

trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/_common/sm/web/sm_WLink.xml.xsl

@@ -51 +51 @@
         <!-- linkOptions        -->
         <xsl0:template name="linkOptions">
-                <xsl0:choose>
-                        <xsl0:when test="sm:link"><xsl0:for-each select="sm:link"><xsl0:call-template name="xLinkOptions"/></xsl0:for-each></xsl0:when>
-                        <xsl0:otherwise><xsl0:call-template name="xLinkOptions"/></xsl0:otherwise>
+                <xsl0:param name="pWidthDefault"/>
+                <xsl0:param name="pHeightDefault"/>
+                <xsl0:choose>
+                        <xsl0:when test="sm:link">
+                                <xsl0:for-each select="sm:link">
+                                        <xsl0:call-template name="xLinkOptions">
+                                                <xsl0:with-param name="pWidthDefault" select="$pWidthDefault"/>
+                                                <xsl0:with-param name="pHeightDefault" select="$pHeightDefault"/>
+                                        </xsl0:call-template>
+                                </xsl0:for-each>
+                        </xsl0:when>
+                        <xsl0:otherwise>
+                                <xsl0:call-template name="xLinkOptions">
+                                        <xsl0:with-param name="pWidthDefault" select="$pWidthDefault"/>
+                                        <xsl0:with-param name="pHeightDefault" select="$pHeightDefault"/>
+                                </xsl0:call-template>
+                        </xsl0:otherwise>
+                </xsl0:choose>
+        </xsl0:template>
+
+        <!-- linkOptionsXsl - production xsl (xsl0: et xsl:) -->
+        <xsl0:template name="linkOptionsXsl">
+                <xsl0:param name="pWidthDefault"/>
+                <xsl0:param name="pHeightDefault"/>
+                <xsl0:choose>
+                        <xsl0:when test="sm:link">
+                                <xsl0:for-each select="sm:link">
+                                        <xsl0:call-template name="xLinkOptionsXsl">
+                                                <xsl0:with-param name="pWidthDefault" select="$pWidthDefault"/>
+                                                <xsl0:with-param name="pHeightDefault" select="$pHeightDefault"/>
+                                        </xsl0:call-template>
+                                </xsl0:for-each>
+                        </xsl0:when>
+                        <xsl0:otherwise>
+                                <xsl0:call-template name="xLinkOptionsXsl">
+                                        <xsl0:with-param name="pWidthDefault" select="$pWidthDefault"/>
+                                        <xsl0:with-param name="pHeightDefault" select="$pHeightDefault"/>
+                                </xsl0:call-template>
+                        </xsl0:otherwise>
                 </xsl0:choose>
         </xsl0:template>
@@ -116 +152 @@
         <!-- xLinkOptions       -->
         <xsl0:template name="xLinkOptions">
+                <xsl0:param name="pWidthDefault"/>
+                <xsl0:param name="pHeightDefault"/>
                 <xsl0:choose>
                         <xsl0:when test="@target='subWindow'">
@@ -133 +171 @@
                                 <xsl0:value-of select="si(sm:position/sm:free/@top, concat('top=', sm:position/sm:free/@top, ','), '')"/>
                                 <xsl0:value-of select="si(sm:position/sm:free/@left, concat('left=', sm:position/sm:free/@left, ','), '')"/>
-                                <xsl0:value-of select="si(sm:position/sm:centerScreen, concat('width=', sm:position/sm:centerScreen/@width, ',height=', sm:position/sm:centerScreen/@height, ',left=&quot;', '+(screen.availWidth-', sm:position/sm:centerScreen/@width, ')/2+&quot;,top=&quot;', '+(screen.availHeight-', sm:position/sm:centerScreen/@height, ')/2+&quot;,'),'')"/>
+                                <xsl0:if test="boolean(sm:position/sm:centerScreen)">
+                                        <xsl0:variable name="vWidth" select="si(boolean(sm:position/sm:centerScreen/@width), sm:position/sm:centerScreen/@width, si(string-length($pWidthDefault)=0, '800', $pWidthDefault))"/>
+                                        <xsl0:variable name="vHeight" select="si(boolean(sm:position/sm:centerScreen/@height), sm:position/sm:centerScreen/@height, si(string-length($pHeightDefault)=0, '600', $pHeightDefault))"/>
+                                        <xsl0:value-of select="concat('width=', $vWidth, ',height=', $vHeight, ',left=&quot;', '+(screen.availWidth-', $vWidth, ')/2+&quot;,top=&quot;', '+(screen.availHeight-', $vHeight, ')/2+&quot;,')"/>
+                                </xsl0:if>
+                                <xsl0:value-of select="si(sm:position/sm:maximized, concat('top=0,left=0,width=', ',width=&quot;', '+screen.availWidth', '+&quot;,height=&quot;', '+screen.availHeight', '+&quot;,'),'')"/>
+                                <xsl0:value-of select="si(sm:windowFeatures/@scrollbars, concat('scrollbars=', sm:windowFeatures/@scrollbars, ','), '')"/>
+                                <xsl0:value-of select="si(sm:windowFeatures/@resizable, concat('resizable=', sm:windowFeatures/@resizable, ','), '')"/>
+                                <xsl0:value-of select="si(sm:windowFeatures/@toolbar, concat('toolbar=', sm:windowFeatures/@toolbar, ','), '')"/>
+                                <xsl0:value-of select="si(sm:windowFeatures/@menubar, concat('menubar=', sm:windowFeatures/@menubar, ','), '')"/>
+                                <xsl0:value-of select="si(sm:windowFeatures/@location, concat('location=', sm:windowFeatures/@location, ','), '')"/>
+                                <xsl0:value-of select="si(sm:windowFeatures/@extraOptions, concat(sm:windowFeatures/@extraOptions, ','), '')"/>
+                        </xsl0:otherwise>
+                </xsl0:choose>
+        </xsl0:template>
+        
+        <!-- xLinkOptionsXsl    -->
+        <xsl0:template name="xLinkOptionsXsl">
+                <xsl0:param name="pWidthDefault"/>
+                <xsl0:param name="pHeightDefault"/>
+                <xsl0:choose>
+                        <xsl0:when test="@target='subWindow'">
+                                <xsl0:value-of select="si(sm:position/sm:free/@width,concat('WIDTH:',sm:position/sm:free/@width,','),'')"/>
+                                <xsl0:value-of select="si(sm:position/sm:free/@height,concat('HEIGHT:',sm:position/sm:free/@height,','),'')"/>
+                                <xsl0:value-of select="si(sm:position/sm:free/@top,concat('TOP:',sm:position/sm:free/@top,','),'')"/>
+                                <xsl0:value-of select="si(sm:position/sm:free/@left,concat('LEFT:',sm:position/sm:free/@left,','),'')"/>
+                                <xsl0:value-of select="si(sm:position/sm:centerScreen,concat('CENTERSCREEN:true,WIDTH:',sm:position/sm:centerScreen/@width,',WIDTH:',sm:position/sm:centerScreen/@width,','),'')"/>
+                                <xsl0:value-of select="si(sm:position/sm:maximized,'MAXIMIZED:true,','')"/>
+                                <xsl0:value-of select="si(sm:windowFeatures/@scrollbars='no','SCROLLBARS:false,','SCROLLBARS:true,')"/>
+                                <xsl0:value-of select="si(sm:windowFeatures/@resizable='yes','RESIZEABLE:true,','RESIZEABLE:false,')"/>
+                                <xsl0:value-of select="si(sm:windowFeatures/@extraOptions, concat(sm:windowFeatures/@extraOptions, ','), '')"/>
+                        </xsl0:when>
+                        <xsl0:otherwise>
+                                <xsl0:value-of select="si(sm:position/sm:free/@width, concat('width=', sm:position/sm:free/@width, ','), '')"/>
+                                <xsl0:value-of select="si(sm:position/sm:free/@height, concat('height=', sm:position/sm:free/@height, ','), '')"/>
+                                <xsl0:value-of select="si(sm:position/sm:free/@top, concat('top=', sm:position/sm:free/@top, ','), '')"/>
+                                <xsl0:value-of select="si(sm:position/sm:free/@left, concat('left=', sm:position/sm:free/@left, ','), '')"/>
+                                <xsl0:if test="boolean(sm:position/sm:centerScreen)">
+                                        <xsl0:variable name="vWidth" select="si(boolean(sm:position/sm:centerScreen/@width), sm:position/sm:centerScreen/@width, $pWidthDefault)"/>
+                                        <xsl0:variable name="vHeight" select="si(boolean(sm:position/sm:centerScreen/@height), sm:position/sm:centerScreen/@height, $pHeightDefault)"/>
+                                        <xsl:variable name="vWidth"><xsl0:copy-of select="$vWidth"/></xsl:variable>
+                                        <xsl:variable name="vHeight"><xsl0:copy-of select="$vHeight"/></xsl:variable>
+                                        <xsl:value-of select="concat('width=', si($vWidth,$vWidth,'800'), ',height=', si($vHeight,$vHeight,'600'), ',left=&quot;', '+(screen.availWidth-', si($vWidth,$vWidth,'800'), ')/2+&quot;,top=&quot;', '+(screen.availHeight-', si($vHeight,$vHeight,'600'), ')/2+&quot;,')"/>
+                                </xsl0:if>
                                 <xsl0:value-of select="si(sm:position/sm:maximized, concat('top=0,left=0,width=', ',width=&quot;', '+screen.availWidth', '+&quot;,height=&quot;', '+screen.availHeight', '+&quot;,'),'')"/>
                                 <xsl0:value-of select="si(sm:windowFeatures/@scrollbars, concat('scrollbars=', sm:windowFeatures/@scrollbars, ','), '')"/>
@@ -189 +270 @@
                         <xsl0:when test="@target='subWindow'">
                                 <xsl0:attribute name="href">#</xsl0:attribute>
-                                <xsl:variable name="vOptions"><xsl0:value-of select="$pOptions"/><xsl0:copy-of select="$pExtraOptions"/></xsl:variable>
+                                <xsl:variable name="vOptions"><xsl0:copy-of select="$pOptions"/><xsl0:copy-of select="$pExtraOptions"/></xsl:variable>
                                 <xsl:attribute name="onclick">scDynUiMgr.displaySubWindow(this,&quot;<xsl0:copy-of select="$pUrl"/>&quot;,&quot;<xsl0:value-of select="si(@windowName, @windowName, 'subWindow')"/>&quot;,{<xsl:value-of select="si(string-length($vOptions)&gt;0, substring($vOptions,0,string-length($vOptions)), '')"/>});return(false);</xsl:attribute>
                         </xsl0:when>
-                        <xsl0:when test="$pOptions!=''">
-                                <xsl:variable name="vOptions"><xsl0:value-of select="$pOptions"/><xsl0:copy-of select="$pExtraOptions"/></xsl:variable>
+                        <xsl0:when test="boolean($pOptions)">
+                                <xsl:variable name="vOptions"><xsl0:copy-of select="$pOptions"/><xsl0:copy-of select="$pExtraOptions"/></xsl:variable>
                                 <xsl:attribute name="href">javascript:window.open(&quot;<xsl0:copy-of select="$pUrl"/>&quot;,<xsl0:choose>
                                         <xsl0:when test="@target='newWindow'">&quot;_blank&quot;</xsl0:when>