Changeset 9401 for trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_dataFormXhtmlTransf/widgets.xsl.xsl

Timestamp:

07/25/07 22:28:40 (5 years ago)

Author:

sam

Message:

• mutualisation elts bs sm:tooltip et sm:link
• sm:link/@target='subWindow' début.

File:

• trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_dataFormXhtmlTransf/widgets.xsl.xsl (modified) (2 diffs)

trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_dataFormXhtmlTransf/widgets.xsl.xsl

@@ -54 +54 @@
                 L'insertion du contenu du widget doit se faire par : <xsl0:apply-templates mode="content"/>.
         -->
+
+        <xsl0:import href="bsco:sm/web/sm_WLink.xml.xsl"/>
         
         <!-- ######### classAtt : Gestion de l'attribut class="" dans les widgets. ########-->  
@@ -81 +83 @@
         <xsl0:template match="sm:WLink" mode="content">
                 <xsl0:variable name="vOptions">
-                        <xsl0:value-of select="si(sm:link/sm:position/sm:free/@width, concat('width=', sm:link/sm:position/sm:free/@width, ','), '')"/>
-                        <xsl0:value-of select="si(sm:link/sm:position/sm:free/@height, concat('height=', sm:link/sm:position/sm:free/@height, ','), '')"/>
-                        <xsl0:value-of select="si(sm:link/sm:position/sm:free/@top, concat('top=', sm:link/sm:position/sm:free/@top, ','), '')"/>
-                        <xsl0:value-of select="si(sm:link/sm:position/sm:free/@left, concat('left=', sm:link/sm:position/sm:free/@left, ','), '')"/>
-                        <xsl0:value-of select="si(sm:link/sm:position/sm:centerScreen, concat('width=', sm:link/sm:position/sm:centerScreen/@width, ',height=', sm:link/sm:position/sm:centerScreen/@height, ',left=&quot;', '+(screen.availWidth-', sm:link/sm:position/sm:centerScreen/@width, ')/2+&quot;,top=&quot;', '+(screen.availHeight-', sm:link/sm:position/sm:centerScreen/@height, ')/2+&quot;,'),'')"/>
-                        <xsl0:value-of select="si(sm:link/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:link/sm:windowFeatures/@scrollbars, concat('scrollbars=', sm:link/sm:windowFeatures/@scrollbars, ','), '')"/>
-                        <xsl0:value-of select="si(sm:link/sm:windowFeatures/@resizable, concat('resizable=', sm:link/sm:windowFeatures/@resizable, ','), '')"/>
-                        <xsl0:value-of select="si(sm:link/sm:windowFeatures/@toolbar, concat('toolbar=', sm:link/sm:windowFeatures/@toolbar, ','), '')"/>
-                        <xsl0:value-of select="si(sm:link/sm:windowFeatures/@menubar, concat('menubar=', sm:link/sm:windowFeatures/@menubar, ','), '')"/>
-                        <xsl0:value-of select="si(sm:link/sm:windowFeatures/@location, concat('location=', sm:link/sm:windowFeatures/@location, ','), '')"/>
-                        <xsl0:value-of select="si(sm:link/sm:windowFeatures/@extraOptions, concat(sm:link/sm:windowFeatures/@extraOptions, ','), '')"/>
+                        <xsl0:call-template name="linkOptions"/><!-- Dans bsco:sm/web/sm_WLink.xml.xsl -->
                 </xsl0:variable>
                 <a>
+                        <xsl0:call-template name="linkHref"><!-- Dans bsco:sm/web/sm_WLink.xml.xsl -->
+                                <xsl0:with-param name="pUrl"><xsl0:apply-templates select="sm:link/*" mode="nav"/></xsl0:with-param>
+                                <xsl0:with-param name="pOptions"><xsl0:value-of select="$vOptions"/></xsl0:with-param>
+                        </xsl0:call-template>
                         <xsl0:call-template name="classAtt"/>
-                        <xsl0:choose>
-                                <xsl0:when test="$vOptions!=''">
-                                        <xsl:attribute name="href">javascript:window.open(&quot;<xsl0:apply-templates select="sm:link/*" mode="nav"/>&quot;,<xsl0:choose>
-                                                <xsl0:when test="sm:link/@target='newWindow'">&quot;_blank&quot;</xsl0:when>
-                                                <xsl0:when test="sm:link/@target='sameWindow'">&quot;_self&quot;</xsl0:when>
-                                                <xsl0:when test="sm:link/@target='namedWindow'">&quot;<xsl0:value-of select="si(sm:link/@windowName, sm:link/@windowName, '_blank')"/>&quot;</xsl0:when>
-                                                <xsl0:otherwise>&quot;_self&quot;</xsl0:otherwise>
-                                        </xsl0:choose>,&quot;<xsl0:value-of select="substring($vOptions,0,string-length($vOptions))"/>&quot;)?void(0):void(0)</xsl:attribute>
-                                </xsl0:when>
-                                <xsl0:otherwise>
-                                        <xsl:attribute name="href"><xsl0:apply-templates select="sm:link/*" mode="nav"/></xsl:attribute>
-                                        <xsl:attribute name="target">
-                                                <xsl0:choose>
-                                                        <xsl0:when test="sm:link/@target='newWindow'">_blank</xsl0:when>
-                                                        <xsl0:when test="sm:link/@target='sameWindow'">_self</xsl0:when>
-                                                        <xsl0:when test="sm:link/@target='namedWindow'"><xsl0:value-of select="si(sm:link/@windowName, sm:link/@windowName, '_blank')"/></xsl0:when>
-                                                        <xsl0:otherwise>_self</xsl0:otherwise>
-                                                </xsl0:choose>
-                                        </xsl:attribute>
-                                </xsl0:otherwise>
-                        </xsl0:choose>
                         <xsl0:call-template name="crossRefEntries"/>
                         <xsl0:if test="count(sm:labelTitle) != 0">