Changeset 6496

Timestamp:

09/08/06 22:52:04 (5 years ago)

Author:

sys

Message:

WScore : cdata -> sm:fixedString/@value

Location:

trunk/Wsp_ModelingAssmnt

Files:

• es/content/assmntUnitMlqXhtmlTransf/xml.xed.xml (modified) (1 diff)
• es/content/xEdition/commonXhtmlTransf.xed.xml (modified) (1 diff)
• spaces/gen/modelBuilder/bs.doss/_common/sma/xhtmlTransf/common.xsl.xsl (modified) (1 diff)
• spaces/gen/modelBuilder/bs.doss/sma_assmntUnitMlqXhtmlTransf/xhtmlContent.xsl.xsl (modified) (1 diff)

trunk/Wsp_ModelingAssmnt/es/content/assmntUnitMlqXhtmlTransf/xml.xed.xml

@@ -199 +199 @@
                                 </xul:choiceInput>
                         </xul:attribute>
-                        <xul:attribute se:bind="attribute" se:name="maxLabels" tooltipTag="Exemples : '3', 'maxCountLabels', 'maxCountLabels+1'">
+                        <xul:attribute se:bind="attribute" se:name="maxLabels" tooltiptext="Exemples : '3', 'maxCountLabels', 'maxCountLabels+1'">
                                 <xul:wordsInput trim="true" />
                         </xul:attribute>

trunk/Wsp_ModelingAssmnt/es/content/xEdition/commonXhtmlTransf.xed.xml

@@ -412 +412 @@
                                                                                                 <se:ref se:name="sm:maxPoints" se:refid="score" />
                                                                                                 <se:ref se:name="sm:minPoints" se:refid="score" />
-                                                                                                <se:ref se:refid="Textnode" se:refurl="chrome://scm_assmnt1_1/content/xEdition/commonXhtmlTransf.xed.xml"/>
+                                                                                                <xul:element se:name="sm:fixedString" se:bind="element" forcefilled="true">
+                                                                                                        <xul:atts>
+                                                                                                                <xul:attribute se:name="value" se:bind="attribute" se:mandat="true">
+                                                                                                                        <xul:wordsInput notnull="true"/>
+                                                                                                                </xul:attribute>
+                                                                                                        </xul:atts>
+                                                                                                </xul:element>
                                                                                         </se:choice>
                                                                                         <xul:insert se:bind="current"/>

trunk/Wsp_ModelingAssmnt/spaces/gen/modelBuilder/bs.doss/_common/sma/xhtmlTransf/common.xsl.xsl

@@ -451 +451 @@
         <xsl0:template match="sm:minPoints" mode="jsScoreCo">"&lt;span class='<xsl0:value-of select="chaineProtegeJs(@commonClass)"/>'>"+<xsl0:if test="@valueFormat='unsignedNumeric'">Math.abs</xsl0:if>(Math.round(this.fMinPts / <xsl0:value-of select="../../@step"/>) * <xsl0:value-of select="../../@step"/>)+"&lt;/span>"+</xsl0:template>
         <xsl0:template match="sm:maxPoints" mode="jsScoreCo">"&lt;span class='<xsl0:value-of select="chaineProtegeJs(@commonClass)"/>'>"+<xsl0:if test="@valueFormat='unsignedNumeric'">Math.abs</xsl0:if>(Math.round(this.fMaxPts / <xsl0:value-of select="../../@step"/>) * <xsl0:value-of select="../../@step"/>)+"&lt;/span>"+</xsl0:template>
-        <xsl0:template match="text()" mode="jsScoreCo">"<xsl0:value-of select="chaineProtegeJs(.)"/>"+</xsl0:template>
-        <xsl0:template match="*" mode="jsScoreCo"/>
+        <xsl0:template match="sm:fixedString" mode="jsScoreCo">"<xsl0:value-of select="chaineProtegeJs(@value)"/>"+</xsl0:template>
+        <xsl0:template match="node()" mode="jsScoreCo"/>
         
         

trunk/Wsp_ModelingAssmnt/spaces/gen/modelBuilder/bs.doss/sma_assmntUnitMlqXhtmlTransf/xhtmlContent.xsl.xsl

@@ -589 +589 @@
         <xsl0:template name="setModeC">.setMode(vC, '<xsl0:value-of select="si(@dropMode, @dropMode, 'ordered')"/>', <xsl0:choose>
                 <xsl0:when test="contains(@maxLabels, 'maxCountLabels')"><xsl:value-of select="java:replaceAll(string(@maxLabels), 'maxCountLabels', string($vCountMaxLabels))"/></xsl0:when>
+                <xsl0:when test="@maxLabels"><xsl0:value-of select="@maxLabels"/></xsl0:when>
                 <xsl0:otherwise>-1</xsl0:otherwise>
         </xsl0:choose>)</xsl0:template>