You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/06/06 10:10:30 UTC
svn commit: r544766 - in /lenya/trunk/src/modules/sitetree: sitemap.xmap
xslt/navigation/sitetree2nav.xsl
Author: andreas
Date: Wed Jun 6 01:10:29 2007
New Revision: 544766
URL: http://svn.apache.org/viewvc?view=rev&rev=544766
Log:
Use only .html URLs in sitetree on the site tab. This should improve the situation described in bug 42567.
Modified:
lenya/trunk/src/modules/sitetree/sitemap.xmap
lenya/trunk/src/modules/sitetree/xslt/navigation/sitetree2nav.xsl
Modified: lenya/trunk/src/modules/sitetree/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sitetree/sitemap.xmap?view=diff&rev=544766&r1=544765&r2=544766
==============================================================================
--- lenya/trunk/src/modules/sitetree/sitemap.xmap (original)
+++ lenya/trunk/src/modules/sitetree/sitemap.xmap Wed Jun 6 01:10:29 2007
@@ -125,6 +125,7 @@
<map:transform src="fallback://lenya/modules/sitetree/xslt/navigation/sitetree2nav.xsl" label="navtree">
<map:parameter name="chosenlanguage" value="{request-param:language}"/>
<map:parameter name="defaultlanguage" value="{page-envelope:default-language}"/>
+ <map:parameter name="extension" value="html"/>
</map:transform>
<map:transform type="uuid2url-sitetree"/>
<map:serialize type="xml"/>
Modified: lenya/trunk/src/modules/sitetree/xslt/navigation/sitetree2nav.xsl
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sitetree/xslt/navigation/sitetree2nav.xsl?view=diff&rev=544766&r1=544765&r2=544766
==============================================================================
--- lenya/trunk/src/modules/sitetree/xslt/navigation/sitetree2nav.xsl (original)
+++ lenya/trunk/src/modules/sitetree/xslt/navigation/sitetree2nav.xsl Wed Jun 6 01:10:29 2007
@@ -28,6 +28,9 @@
<xsl:param name="chosenlanguage"/>
<xsl:param name="defaultlanguage"/>
<xsl:param name="currentPath"/>
+
+ <!-- force a specific extension for node URLs -->
+ <xsl:param name="extension"/>
<xsl:template match="tree:fragment">
@@ -102,10 +105,14 @@
<!-- suffix - only when @href is not present -->
<xsl:variable name="extensionParam">
- <xsl:if test="@suffix">
- <xsl:text>?uuid2url.extension=</xsl:text>
- <xsl:value-of select="@suffix"/>
- </xsl:if>
+ <xsl:choose>
+ <xsl:when test="$extension">
+ <xsl:text>?uuid2url.extension=</xsl:text><xsl:value-of select="$extension"/>
+ </xsl:when>
+ <xsl:when test="@suffix">
+ <xsl:text>?uuid2url.extension=</xsl:text><xsl:value-of select="@suffix"/>
+ </xsl:when>
+ </xsl:choose>
</xsl:variable>
<xsl:if test="$currentPath = $path">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org