Changeset 5332 for branches/release-0.15.x/pustefix-core/src/main/resources/PUSTEFIX-INF/xsl/include.xsl
- Timestamp:
- 09/01/10 15:58:37 (21 months ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
branches/release-0.15.x/pustefix-core/src/main/resources/PUSTEFIX-INF/xsl/include.xsl
r5108 r5332 31 31 <xsl:param name="themes"/> 32 32 <xsl:param name="prohibitEdit">no</xsl:param> 33 <xsl:param name="__defining_module"/> 33 34 34 35 <xsl:template match="pfx:langselect"> … … 207 208 <xsl:param name="module"><xsl:value-of select="@module"/></xsl:param> 208 209 <xsl:param name="search"><xsl:value-of select="@search"/></xsl:param> 210 <xsl:variable name="module_name"> 211 <xsl:choose> 212 <xsl:when test="@module='PAGEDEF' or @module='pagedef'"> 213 <xsl:value-of select="$__defining_module"/> 214 </xsl:when> 215 <xsl:otherwise> 216 <xsl:value-of select="$module"/> 217 </xsl:otherwise> 218 </xsl:choose> 219 </xsl:variable> 209 220 <xsl:variable name="href_int"> 210 221 <xsl:if test="$href"> … … 238 249 select="include:get(string($realpath), string($part), 239 250 string($__target_gen), string($__target_key), 240 string($parent_part), string($parent_theme), $computed_inc, $module , $search)"/>251 string($parent_part), string($parent_theme), $computed_inc, $module_name, $search)"/> 241 252 <xsl:variable name="__resolveduri"><xsl:value-of select="include:getResolvedURI()"/></xsl:variable> 242 253 <!-- Start image of edited region --> … … 274 285 <xsl:call-template name="pfx:missinc"> 275 286 <xsl:with-param name="href" select="include:getResolvedURI()"/> 276 <xsl:with-param name="module" select="$module "/>287 <xsl:with-param name="module" select="$module_name"/> 277 288 <xsl:with-param name="part" select="$part"/> 278 289 </xsl:call-template> … … 427 438 <xsl:param name="module"/> 428 439 <xsl:param name="search"/> 440 <xsl:variable name="module_name"> 441 <xsl:choose> 442 <xsl:when test="$module='PAGEDEF' or $module='pagedef'"> 443 <xsl:value-of select="$__defining_module"/> 444 </xsl:when> 445 <xsl:otherwise> 446 <xsl:value-of select="$module"/> 447 </xsl:otherwise> 448 </xsl:choose> 449 </xsl:variable> 429 450 <xsl:choose> 430 451 <xsl:when test="($src and not($src = '') and (not($themed-path) or $themed-path = '') and (not($themed-img) or $themed-img = '')) or … … 434 455 <xsl:value-of select="image:getSrc(string($src),string($themed-path),string($themed-img), 435 456 string($parent_part),string($parent_theme), 436 string($__target_gen),string($__target_key),string($module ),string($search))"/>457 string($__target_gen),string($__target_key),string($module_name),string($search))"/> 437 458 </xsl:when> 438 459 <xsl:otherwise>
