Some modifications for navigation and related links, mostly bug fixes.

git-svn-id: https://svn.libreccm.org/ccm/trunk@3097 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2015-01-20 18:12:11 +00:00
parent fa44c64eac
commit b5af28c3ad
2 changed files with 24 additions and 2 deletions

View File

@ -30,7 +30,16 @@
version="2.0"> version="2.0">
<xsl:template match="related-links"> <xsl:template match="related-links">
<xsl:param name="contentitem-tree" tunnel="yes"/> <xsl:param name="contentitem-tree" tunnel="yes">
<xsl:choose>
<xsl:when test="$data-tree/nav:greetingItem">
<xsl:copy-of select="$data-tree/nav:greetingItem/cms:item/*"/>
</xsl:when>
<xsl:otherwise>
<xsl:copy-of select="$data-tree/cms:contentPanel/cms:item/*"/>
</xsl:otherwise>
</xsl:choose>
</xsl:param>
<xsl:if test="$contentitem-tree/links"> <xsl:if test="$contentitem-tree/links">
<xsl:apply-templates/> <xsl:apply-templates/>
@ -38,7 +47,16 @@
</xsl:template> </xsl:template>
<xsl:template match="related-links//related-link"> <xsl:template match="related-links//related-link">
<xsl:param name="contentitem-tree" tunnel="yes"/> <xsl:param name="contentitem-tree" tunnel="yes">
<xsl:choose>
<xsl:when test="$data-tree/nav:greetingItem">
<xsl:copy-of select="$data-tree/nav:greetingItem/cms:item/*"/>
</xsl:when>
<xsl:otherwise>
<xsl:copy-of select="$data-tree/cms:contentPanel/cms:item/*"/>
</xsl:otherwise>
</xsl:choose>
</xsl:param>
<xsl:variable name="links-layout-tree" select="current()"/> <xsl:variable name="links-layout-tree" select="current()"/>

View File

@ -128,6 +128,10 @@
</xsl:template> </xsl:template>
<xsl:template match="breadcrumbs-current-category">
<xsl:value-of select="$data-tree//nav:categoryPath/nav:category[position() = last()]/@title"/>
</xsl:template>
<foundry:doc> <foundry:doc>
<foundry:doc-attribute name="navigation-id"> <foundry:doc-attribute name="navigation-id">
The id of the navigation/category system from which URL should be retrieved. Default The id of the navigation/category system from which URL should be retrieved. Default