LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Various bug fixes and improvments for Foundry found while working on the theme for Camden. 

This includes:
- Related links
- Content item
- Navigation: It is now possible to omit the root part and the last path of the breadcrumbs)


git-svn-id: https://svn.libreccm.org/ccm/trunk@3001 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2014-12-03 09:07:37 +00:00
parent 77cecf8a6e
commit 0aacd1707a
3 changed files with 68 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl
View File

@ -630,21 +630,25 @@
<xsl:otherwise> <xsl:otherwise>
<xsl:choose> <xsl:choose>
<xsl:when test="$template-map/content-item[@content-type = $content-type <xsl:when test="$template-map/content-item[@content-type = $content-type
and @category = $category]"> and @category = $category
and not(@style)]">
<xsl:call-template name="foundry:process-contentitem-template"> <xsl:call-template name="foundry:process-contentitem-template">
<xsl:with-param name="template-file" <xsl:with-param name="template-file"
select="$template-map/content-item[@content-type = $content-type select="$template-map/content-item[@content-type = $content-type
and @category = $category]"/> and @category = $category
and not(@style)]"/>
<xsl:with-param name="contentitem-tree" <xsl:with-param name="contentitem-tree"
select="$contentitem-tree"/> select="$contentitem-tree"/>
</xsl:call-template> </xsl:call-template>
</xsl:when> </xsl:when>
<xsl:when test="$template-map/content-item[@content-type = $content-type <xsl:when test="$template-map/content-item[@content-type = $content-type
and not(@category)]"> and not(@category)
and not(@style)]">
<xsl:call-template name="foundry:process-contentitem-template"> <xsl:call-template name="foundry:process-contentitem-template">
<xsl:with-param name="template-file" <xsl:with-param name="template-file"
select="$template-map/content-item[@content-type = $content-type select="$template-map/content-item[@content-type = $content-type
and not(@category)]"/> and not(@category)
and not(@style)]"/>
<xsl:with-param name="contentitem-tree" <xsl:with-param name="contentitem-tree"
select="$contentitem-tree"/> select="$contentitem-tree"/>
</xsl:call-template> </xsl:call-template>

26
ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/related-links.xsl
View File

@ -30,29 +30,21 @@
version="2.0"> version="2.0">
<xsl:template match="related-links"> <xsl:template match="related-links">
<xsl:if test="$data-tree/cms:contentPanel/cms:item/links <xsl:param name="contentitem-tree" tunnel="yes"/>
or $data-tree/nav:greetingItem/cms:item/links">
<xsl:if test="$contentitem-tree/links">
<xsl:apply-templates/> <xsl:apply-templates/>
</xsl:if> </xsl:if>
</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:variable name="links-layout-tree" select="current()"/> <xsl:variable name="links-layout-tree" select="current()"/>
<xsl:variable name="contentitem-tree"> <xsl:for-each select="$contentitem-tree/links">
<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:variable>
<xsl:for-each select="$contentitem-tree/*[name() = 'links']">
<xsl:sort select="linkOrder"/> <xsl:sort select="linkOrder"/>
<xsl:choose> <xsl:choose>
<xsl:when test="./targetType = 'internalLink'"> <xsl:when test="./targetType = 'internalLink'">
<xsl:apply-templates select="$links-layout-tree/internal/*"> <xsl:apply-templates select="$links-layout-tree/internal/*">
@ -64,10 +56,10 @@
<xsl:with-param name="target-item-title" <xsl:with-param name="target-item-title"
tunnel="yes" tunnel="yes"
select="./targetItem/title"/> select="./targetItem/title"/>
<xsl:with-param name="contentitem-tree" <!--<xsl:with-param name="contentitem-tree"
tunnel="yes"> tunnel="yes">
<xsl:copy-of select="./targetItem/*"/> <xsl:copy-of select="./targetItem/*"/>
</xsl:with-param> </xsl:with-param>-->
</xsl:apply-templates> </xsl:apply-templates>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>

67
ccm-core/web/themes/foundry/foundry/lib/template-tags/navigation.xsl
View File

@ -2,6 +2,7 @@
<!DOCTYPE stylesheet> <!DOCTYPE stylesheet>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:foundry="http://foundry.libreccm.org" xmlns:foundry="http://foundry.libreccm.org"
xmlns:bebop="http://www.arsdigita.com/bebop/1.0" xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
xmlns:nav="http://ccm.redhat.com/navigation" xmlns:nav="http://ccm.redhat.com/navigation"
@ -13,22 +14,49 @@
<foundry:doc-file-desc> <foundry:doc-file-desc>
<p> <p>
These tags are used to output data provided by the <em>ccm-navigation</em> module. These tags are used to output data provided by the <em>ccm-navigation</em> module.
More excalty the navigation menu(s) and the breadcrumbs on a site are generated More exactly the navigation menu(s) and the breadcrumbs on a site are generated
using these tags. using these tags.
</p> </p>
</foundry:doc-file-desc> </foundry:doc-file-desc>
</foundry:doc-file> </foundry:doc-file>
<foundry:doc section="user" type="template-tag">
<foundry:doc-desc>
<p>
Show the breadcrumbs for the current page. The separator between each breadcrumb is
provided by the child element <code>breakcrumb-separator</code>. The contents
of this element is used a separator between the breadcrumbs. This allows it to
use simple characters of more complex HTML.
</p>
</foundry:doc-desc>
<foundry:doc:attributes>
<foundry:doc-attribute name="omit-root">
<p>
If set the <code>yes</code>, the breadcrumb for the root level is omitted.
</p>
</foundry:doc-attribute>
<foundry:doc-attribute name="omit-last">
<p>
If set the <code>yes</code>, the breadcrumb for last entry (the current
category) is omitted.
</p>
</foundry:doc-attribute>
</foundry:doc:attributes>
</foundry:doc>
<xsl:template match="breadcrumbs"> <xsl:template match="breadcrumbs">
<xsl:apply-templates select="./*[not(name = 'breadcrumb-separator')]"> <xsl:apply-templates select="./*[not(name = 'breadcrumb-separator')]">
<xsl:with-param name="breadcrumb-separator" tunnel="yes"> <xsl:with-param name="breadcrumb-separator" tunnel="yes">
<xsl:apply-templates select="./breadcrumb-separator/*"/> <xsl:apply-templates select="./breadcrumb-separator/*"/>
</xsl:with-param> </xsl:with-param>
<xsl:with-param name="omit-root" tunnel="yes" select="foundry:boolean(./@omit-root)"/>
<xsl:with-param name="omit-last" tunnel="yes" select="foundry:boolean(./@omit-last)"/>
</xsl:apply-templates> </xsl:apply-templates>
</xsl:template> </xsl:template>
<xsl:template match="breadcrumb-link"> <xsl:template match="breadcrumb-link">
<xsl:param name="breadcrumb-separator" tunnel="yes"/> <xsl:param name="breadcrumb-separator" tunnel="yes"/>
<xsl:param name="omit-root" tunnel="yes" as="xs:boolean" select="false()"/>
<xsl:param name="omit-last" tunnel="yes" as="xs:boolean" select="false()"/>
<xsl:variable name="show-description" <xsl:variable name="show-description"
select="foundry:boolean(foundry:get-attribute-value(current(), select="foundry:boolean(foundry:get-attribute-value(current(),
@ -36,21 +64,28 @@
'false'))"/> 'false'))"/>
<xsl:variable name="breadcrumb-link-tree" select="current()"/> <xsl:variable name="breadcrumb-link-tree" select="current()"/>
<xsl:apply-templates select="$breadcrumb-link-tree/*"> <xsl:variable name="last-index"
<xsl:with-param name="href" select="if ($omit-last and count($data-tree//nav:categoryPath/nav:category) &gt; 1)
tunnel="yes" then count($data-tree//nav:categoryPath/nav:category) - 1
select="$data-tree//nav:categoryPath/nav:category[position() = 1]/@url"/> else count($data-tree//nav:categoryPath/nav:category)"/>
<xsl:with-param name="title"
tunnel="yes" <xsl:if test="not($omit-root)">
select="foundry:get-static-text('breadcrumbs', 'root')"/> <xsl:apply-templates select="$breadcrumb-link-tree/*">
<xsl:with-param name="breadcrumb-label" <xsl:with-param name="href"
tunnel="yes" tunnel="yes"
select="foundry:get-static-text('breadcrumbs', 'root')"/> select="$data-tree//nav:categoryPath/nav:category[position() = 1]/@url"/>
</xsl:apply-templates> <xsl:with-param name="title"
<xsl:if test="count($data-tree//nav:categoryPath/nav:category) &gt; 1"> tunnel="yes"
<xsl:copy-of select="$breadcrumb-separator/*"/> select="foundry:get-static-text('breadcrumbs', 'root')"/>
<xsl:with-param name="breadcrumb-label"
tunnel="yes"
select="foundry:get-static-text('breadcrumbs', 'root')"/>
</xsl:apply-templates>
<xsl:if test="count($data-tree//nav:categoryPath/nav:category) &gt; 1">
<xsl:copy-of select="$breadcrumb-separator/*"/>
</xsl:if>
</xsl:if> </xsl:if>
<xsl:for-each select="$data-tree//nav:categoryPath/nav:category[not(position() = 1)]"> <xsl:for-each select="$data-tree//nav:categoryPath/nav:category[not(position() = 1) and position() &lt;= $last-index]">
<xsl:apply-templates select="$breadcrumb-link-tree/*"> <xsl:apply-templates select="$breadcrumb-link-tree/*">
<xsl:with-param name="href" tunnel="yes" select="./@url"/> <xsl:with-param name="href" tunnel="yes" select="./@url"/>
<xsl:with-param name="title" tunnel="yes"> <xsl:with-param name="title" tunnel="yes">
@ -265,7 +300,7 @@
<xsl:value-of select="concat(' count(category)', count($current-level-tree))"/> <xsl:value-of select="concat(' count(category)', count($current-level-tree))"/>
</xsl:message> </xsl:message>
<!--<dl> <!--<dl>
<dt>navigation-id</dt> <dt>navigation-id</dt>
<dd> <dd>
<xsl:value-of select="$navigation-id"/> <xsl:value-of select="$navigation-id"/>