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 2006/11/14 14:55:19 UTC
svn commit: r474790 - in /lenya/trunk/src/webapp: global-sitemap.xmap
lenya/xslt/modules/modules2xinclude.xsl
Author: andreas
Date: Tue Nov 14 05:55:19 2006
New Revision: 474790
URL: http://svn.apache.org/viewvc?view=rev&rev=474790
Log:
Consider template modules when generating menu
Modified:
lenya/trunk/src/webapp/global-sitemap.xmap
lenya/trunk/src/webapp/lenya/xslt/modules/modules2xinclude.xsl
Modified: lenya/trunk/src/webapp/global-sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/global-sitemap.xmap?view=diff&rev=474790&r1=474789&r2=474790
==============================================================================
--- lenya/trunk/src/webapp/global-sitemap.xmap (original)
+++ lenya/trunk/src/webapp/global-sitemap.xmap Tue Nov 14 05:55:19 2006
@@ -213,7 +213,7 @@
<!-- menu-xml/modules -->
<!-- menu-xml/modules/{pub-id}/{area}.xml -->
<map:match pattern="menu-xml/modules/*/*.xml">
- <map:generate src="lenya/pubs/{1}/config/publication.xconf"/>
+ <map:generate src="aggregate-fallback://config/publication.xconf"/>
<map:transform src="lenya/xslt/modules/modules2xinclude.xsl">
<map:parameter name="area" value="{2}"/>
</map:transform>
Modified: lenya/trunk/src/webapp/lenya/xslt/modules/modules2xinclude.xsl
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/xslt/modules/modules2xinclude.xsl?view=diff&rev=474790&r1=474789&r2=474790
==============================================================================
--- lenya/trunk/src/webapp/lenya/xslt/modules/modules2xinclude.xsl (original)
+++ lenya/trunk/src/webapp/lenya/xslt/modules/modules2xinclude.xsl Tue Nov 14 05:55:19 2006
@@ -26,14 +26,18 @@
xmlns:menu="http://apache.org/cocoon/lenya/menubar/1.0"
>
-<xsl:param name="area"/>
+ <xsl:param name="area"/>
-<xsl:template match="publication">
- <menu:menu>
- <xsl:for-each select="module">
+ <xsl:template match="publication">
+ <menu:menu>
+ <xsl:apply-templates select="module"/>
+ </menu:menu>
+ </xsl:template>
+
+ <xsl:template match="module">
+ <xsl:if test="not(preceding-sibling::module[@name = current()/@name])">
<xi:include href="cocoon:/menu-xml/module/{$area}/{@name}.xml" xpointer="xpointer(/*/*)"/>
- </xsl:for-each>
- </menu:menu>
-</xsl:template>
+ </xsl:if>
+ </xsl:template>
</xsl:stylesheet>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org