LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

CCM NG: Merged latest changes for Foundry from trunk 

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@3869 8810af33-2d31-482b-a856-94f89814c4df
pull/2/head
jensp 2016-02-17 19:05:20 +00:00
parent 8e05fe06af
commit de3ae25985
10 changed files with 290 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ccm-theme-foundry/src/main/resources/themes/foundry/foundry/lib/global-vars.xsl
View File

@ -93,8 +93,7 @@ processor, some are read from the configuration files of Foundry and some are de
</p> </p>
</foundry:doc-desc> </foundry:doc-desc>
</foundry:doc> </foundry:doc>
<xsl:param name="theme-prefix" <xsl:param name="theme-prefix"/>
select="concat($context-prefix, '/themes/libreccm-default')"/>
<foundry:doc section="devel" type="env-var"> <foundry:doc section="devel" type="env-var">
<foundry:doc-desc> <foundry:doc-desc>

4
ccm-theme-foundry/src/main/resources/themes/foundry/foundry/lib/template-parser.xsl
View File

@ -854,7 +854,7 @@
<xsl:variable name="minute"> <xsl:variable name="minute">
<xsl:choose> <xsl:choose>
<xsl:when test="string-length($minute-value) &lt; 2"> <xsl:when test="string-length($minute-value) &lt; 2">
<xsl:value-of select="concat('0', $hour-value)"/> <xsl:value-of select="concat('0', $minute-value)"/>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:value-of select="$minute-value"/> <xsl:value-of select="$minute-value"/>
@ -881,4 +881,4 @@
</xsl:choose> </xsl:choose>
</xsl:template> </xsl:template>
</xsl:stylesheet> </xsl:stylesheet>

6
ccm-theme-foundry/src/main/resources/themes/foundry/foundry/lib/template-tags/content-items/assets/image-attachments.xsl
View File

@ -215,9 +215,9 @@
<xsl:variable name="images-layout-tree" select="current()"/> <xsl:variable name="images-layout-tree" select="current()"/>
<xsl:message> <!--<xsl:message>
<xsl:value-of select="concat('imageAttachment id = ', $contentitem-tree/nav:attribute[@name='imageAttachments.image.id'][position() = 1])"/> <xsl:value-of select="concat('imageAttachment id = ', $contentitem-tree/nav:attribute[@name='imageAttachments.image.id'][position() = 1])"/>
</xsl:message> </xsl:message>-->
<xsl:apply-templates select="$images-layout-tree/*"> <xsl:apply-templates select="$images-layout-tree/*">
<xsl:with-param name="src" <xsl:with-param name="src"
@ -243,4 +243,4 @@
</xsl:for-each>--> </xsl:for-each>-->
</xsl:template> </xsl:template>
</xsl:stylesheet> </xsl:stylesheet>

19
ccm-theme-foundry/src/main/resources/themes/foundry/foundry/lib/template-tags/content-items/contact.xsl
View File

@ -196,10 +196,21 @@
</foundry:doc> </foundry:doc>
<xsl:template match="content-item-layout//*[ends-with(name(), 'contact-entries')]//contact-entry//contact-entry-value-as-link"> <xsl:template match="content-item-layout//*[ends-with(name(), 'contact-entries')]//contact-entry//contact-entry-value-as-link">
<xsl:param name="value" tunnel="yes"/> <xsl:param name="value" tunnel="yes"/>
<xsl:apply-templates> <xsl:choose>
<xsl:with-param name="href" tunnel="yes" select="$value"/> <xsl:when test="contains($value, '@')">
</xsl:apply-templates> <xsl:apply-templates>
<xsl:with-param name="href"
tunnel="yes"
select="concat('mailto:', $value)"/>
</xsl:apply-templates>
</xsl:when>
<xsl:otherwise>
<xsl:apply-templates>
<xsl:with-param name="href" tunnel="yes" select="$value"/>
</xsl:apply-templates>
</xsl:otherwise>
</xsl:choose>
</xsl:template> </xsl:template>
<foundry:doc section="user" type="template-tag"> <foundry:doc section="user" type="template-tag">

18
ccm-theme-foundry/src/main/resources/themes/foundry/foundry/lib/template-tags/content-items/formitem.xsl
View File

@ -75,6 +75,22 @@
else $data-tree//cms:item/@formAction}" else $data-tree//cms:item/@formAction}"
accept-charset="utf-8"> accept-charset="utf-8">
<xsl:if test="$contentitem-tree/honeypot">
<div class="formitem-hidden">
<label for="{$contentitem-tree/honeypot/@name}">
<xsl:value-of select="foundry:get-static-text('form-item', 'honeypot-label')"/>
</label>
<input type="text" name="{$contentitem-tree/honeypot/@name}"/>
</div>
</xsl:if>
<xsl:if test="$contentitem-tree/minTimeCheck">
<input type="hidden"
name="minTimeCheck"
value="{$contentitem-tree/minTimeCheck/@generated}"/>
</xsl:if>
<xsl:if test="not($contentitem-tree/remote = 'true')"> <xsl:if test="not($contentitem-tree/remote = 'true')">
<input type="hidden" <input type="hidden"
value="visited" value="visited"
@ -107,4 +123,4 @@
</xsl:stylesheet> </xsl:stylesheet>

12
ccm-theme-foundry/src/main/resources/themes/foundry/foundry/lib/template-tags/data-tags.xsl
View File

@ -48,7 +48,17 @@
</foundry:doc-see-also> </foundry:doc-see-also>
</foundry:doc> </foundry:doc>
<xsl:template match="show-page-title"> <xsl:template match="show-page-title">
<xsl:value-of select="foundry:title()"/> <xsl:variable name="useCategoryMenu"
select="if(./@useCategoryMenu)
then ./@useCategoryMenu
else 'categoryMenu'"/>
<xsl:variable name="useRootCategoryIndexItemTitle"
select="if(./@useRootIndexItemCategoryTitle)
then foundry:boolean(./@useRootCategoryIndexItemTitle)
else false()"/>
<xsl:value-of select="foundry:title($useCategoryMenu,
$useRootCategoryIndexItemTitle)"/>
</xsl:template> </xsl:template>
<foundry:doc section="user" <foundry:doc section="user"

15
ccm-theme-foundry/src/main/resources/themes/foundry/foundry/lib/template-tags/html-tags.xsl
View File

@ -1454,12 +1454,12 @@
<xsl:value-of select="foundry:get-static-text('', ./@title, false())"/> <xsl:value-of select="foundry:get-static-text('', ./@title, false())"/>
</xsl:attribute> </xsl:attribute>
</xsl:if> </xsl:if>
<xsl:if test="$width &gt; 0"> <xsl:if test="$width != '' and $width &gt; 0">
<xsl:attribute name="width"> <xsl:attribute name="width">
<xsl:value-of select="$width"/> <xsl:value-of select="$width"/>
</xsl:attribute> </xsl:attribute>
</xsl:if> </xsl:if>
<xsl:if test="$height &gt; 0"> <xsl:if test="$height != '' and $height &gt; 0">
<xsl:attribute name="height"> <xsl:attribute name="height">
<xsl:value-of select="$height"/> <xsl:value-of select="$height"/>
</xsl:attribute> </xsl:attribute>
@ -2183,9 +2183,14 @@
<xsl:with-param name="copy-attributes" <xsl:with-param name="copy-attributes"
select="'autofocus disabled multiple required size'"/> select="'autofocus disabled multiple required size'"/>
</xsl:call-template> </xsl:call-template>
<xsl:if test="$name != ''"> <xsl:choose>
<xsl:attribute name="name" select="$name"/> <xsl:when test="$name != ''">
</xsl:if> <xsl:attribute name="name" select="$name"/>
</xsl:when>
<xsl:when test="./@name">
<xsl:attribute name="name" select="./@name"/>
</xsl:when>
</xsl:choose>
<xsl:if test="$disabled = true()"> <xsl:if test="$disabled = true()">
<xsl:attribute name="disabled" select="'disabled'"/> <xsl:attribute name="disabled" select="'disabled'"/>
</xsl:if> </xsl:if>

230
ccm-theme-foundry/src/main/resources/themes/foundry/foundry/lib/template-tags/navigation.xsl
View File

@ -140,7 +140,28 @@
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:template> </xsl:template>
<xsl:template match="breadcrumbs-current-main-category-link">
<xsl:choose>
<xsl:when test="count($data-tree//nav:categoryPath/nav:category[position() &gt; 1])">
<xsl:apply-templates>
<xsl:with-param name="href"
tunnel="yes"
select="$data-tree//nav:categoryPath/nav:category[position() = 2]/@url"/>
</xsl:apply-templates>
</xsl:when>
<xsl:otherwise>
<xsl:if test="foundry:boolean(./@show-root)">
<xsl:apply-templates>
<xsl:with-param name="href"
tunnel="yes"
select="$data-tree//nav:categoryPath/nav:category[position() = 1]/@url"/>
</xsl:apply-templates>
</xsl:if>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template match="breadcrumbs-current-category"> <xsl:template match="breadcrumbs-current-category">
<xsl:value-of select="$data-tree//nav:categoryPath/nav:category[position() = last()]/@title"/> <xsl:value-of select="$data-tree//nav:categoryPath/nav:category[position() = last()]/@title"/>
</xsl:template> </xsl:template>
@ -173,9 +194,20 @@
<xsl:variable name="navigation-id" <xsl:variable name="navigation-id"
select="foundry:get-attribute-value(current(), 'navigation-id', 'categoryMenu')"/> select="foundry:get-attribute-value(current(), 'navigation-id', 'categoryMenu')"/>
<xsl:apply-templates> <xsl:apply-templates>
<xsl:with-param name="href" <!--<xsl:with-param name="href"
select="$data-tree//nav:categoryMenu[@id=$navigation-id]/nav:category/@url" select="$data-tree//nav:categoryMenu[@id=$navigation-id]/nav:category/@url"
tunnel="yes"/> tunnel="yes"/>-->
<xsl:with-param name="href"
tunnel="yes">
<xsl:choose>
<xsl:when test="$data-tree//nav:categoryMenu[@id=$navigation-id]/nav:category/@url">
<xsl:value-of select="$data-tree//nav:categoryMenu[@id=$navigation-id]/nav:category/@url"/>
</xsl:when>
<xsl:when test="$data-tree//nav:categoryPath/nav:category/@url">
<xsl:value-of select="$data-tree//nav:categoryPath/nav:category/@url"/>
</xsl:when>
</xsl:choose>
</xsl:with-param>
<xsl:with-param name="navigation-id" select="$navigation-id" tunnel="yes"/> <xsl:with-param name="navigation-id" select="$navigation-id" tunnel="yes"/>
<xsl:with-param name="title" tunnel="yes"> <xsl:with-param name="title" tunnel="yes">
<xsl:choose> <xsl:choose>
@ -183,9 +215,16 @@
<xsl:choose> <xsl:choose>
<xsl:when test="./@use-static-title = 'false'"> <xsl:when test="./@use-static-title = 'false'">
<xsl:value-of select="$data-tree//nav:categoryMenu[@id=$navigation-id]/nav:category/@title"/> <xsl:value-of select="$data-tree//nav:categoryMenu[@id=$navigation-id]/nav:category/@title"/>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:value-of select="foundry:get-static-text('navigation', $data-tree//nav:categoryMenu[@id=$navigation-id]/@navigation-id, false())"/> <xsl:choose>
<xsl:when test="$data-tree//nav:categoryMenu[@id=$navigation-id]/@navigation-id">
<xsl:value-of select="foundry:get-static-text('navigation', $data-tree//nav:categoryMenu[@id=$navigation-id]/@navigation-id, false())"/>
</xsl:when>
<xsl:when test="$data-tree//nav:categoryPath/@navigation-id">
<xsl:value-of select="foundry:get-static-text('navigation', $data-tree//nav:categoryPath[@id=$navigation-id]/@navigation-id, false())"/>
</xsl:when>
</xsl:choose>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:when> </xsl:when>
@ -212,6 +251,9 @@
<xsl:when test="string-length($data-tree//nav:categoryMenu[@id=$navigation-id]/nav:category/@title) &gt; 0"> <xsl:when test="string-length($data-tree//nav:categoryMenu[@id=$navigation-id]/nav:category/@title) &gt; 0">
<xsl:value-of select="foundry:shying($data-tree//nav:categoryMenu[@id=$navigation-id]/nav:category/@title)"/> <xsl:value-of select="foundry:shying($data-tree//nav:categoryMenu[@id=$navigation-id]/nav:category/@title)"/>
</xsl:when> </xsl:when>
<xsl:when test="string-length($data-tree//nav:categoryPath/nav:category/@title) &gt; 0">
<xsl:value-of select="foundry:shying($data-tree/nav:categoryPath/nav:category/@title)"/>
</xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:value-of select="''"/> <xsl:value-of select="''"/>
</xsl:otherwise> </xsl:otherwise>
@ -347,36 +389,36 @@
<xsl:when test="($current-level &lt; $min-level) and $current-level-tree/nav:category"> <xsl:when test="($current-level &lt; $min-level) and $current-level-tree/nav:category">
<xsl:apply-templates select="."> <xsl:apply-templates select=".">
<xsl:with-param name="navigation-id" <xsl:with-param name="navigation-id"
select="$navigation-id" select="$navigation-id"
tunnel="yes"/> tunnel="yes"/>
<xsl:with-param name="with-colorset" <xsl:with-param name="with-colorset"
select="$with-colorset" select="$with-colorset"
tunnel="yes"/> tunnel="yes"/>
<xsl:with-param name="min-level" <xsl:with-param name="min-level"
select="$min-level" select="$min-level"
tunnel="yes"/> tunnel="yes"/>
<xsl:with-param name="max-level" <xsl:with-param name="max-level"
select="$max-level"/> select="$max-level"/>
<xsl:with-param name="show-description-text" <xsl:with-param name="show-description-text"
select="$show-description-text" select="$show-description-text"
tunnel="yes"/> tunnel="yes"/>
<xsl:with-param name="selected-only" <xsl:with-param name="selected-only"
select="$selected-only" select="$selected-only"
tunnel="yes"/> tunnel="yes"/>
<xsl:with-param name="current-level" <xsl:with-param name="current-level"
select="$current-level + 1" select="$current-level + 1"
tunnel="yes"/> tunnel="yes"/>
<xsl:with-param name="current-level-tree" <xsl:with-param name="current-level-tree"
select="$current-level-tree/nav:category" select="$current-level-tree/nav:category"
tunnel="yes"/> tunnel="yes"/>
<xsl:with-param name="navigation-links-tree" select="." <xsl:with-param name="navigation-links-tree" select="."
tunnel="yes"/> tunnel="yes"/>
</xsl:apply-templates> </xsl:apply-templates>
</xsl:when> </xsl:when>
</xsl:choose> </xsl:choose>
</xsl:template> </xsl:template>
<xsl:template match="navigation-links//navigation-link"> <xsl:template match="navigation//navigation-links//navigation-link">
<xsl:param name="navigation-id" tunnel="yes"/> <xsl:param name="navigation-id" tunnel="yes"/>
<xsl:param name="with-colorset" tunnel="yes"/> <xsl:param name="with-colorset" tunnel="yes"/>
<xsl:param name="min-level" tunnel="yes"/> <xsl:param name="min-level" tunnel="yes"/>
@ -467,6 +509,7 @@
<xsl:value-of select="concat(' colorset-', position())"/> <xsl:value-of select="concat(' colorset-', position())"/>
</xsl:if> </xsl:if>
</xsl:with-param> </xsl:with-param>
<xsl:with-param name="id" select="concat('id-', ./@id)"/>
</xsl:apply-templates> </xsl:apply-templates>
</xsl:for-each> </xsl:for-each>
</xsl:otherwise> </xsl:otherwise>
@ -479,7 +522,7 @@
<xsl:value-of select="$link-label"/> <xsl:value-of select="$link-label"/>
</xsl:template> </xsl:template>
<xsl:template match="navigation-link//navigation-sublinks"> <xsl:template match="navigation//navigation-link//navigation-sublinks">
<xsl:param name="navigation-id" tunnel="yes"/> <xsl:param name="navigation-id" tunnel="yes"/>
<xsl:param name="with-colorset" tunnel="yes"/> <xsl:param name="with-colorset" tunnel="yes"/>
<xsl:param name="min-level" tunnel="yes"/> <xsl:param name="min-level" tunnel="yes"/>
@ -550,6 +593,143 @@
<xsl:value-of select="$quicklink-description"/> <xsl:value-of select="$quicklink-description"/>
</xsl:template> </xsl:template>
<!-- Navigation hierarchy -->
<xsl:template match="navigation-hierarchy">
<xsl:apply-templates>
<xsl:with-param name="hierarchy-id"
select="foundry:get-attribute-value(current(), 'hierarchy-id', 'categoryMenu')"
tunnel="yes"/>
<xsl:with-param name="with-colorset"
select="foundry:boolean(foundry:get-attribute-value(current(), 'with-colorset', 'false'))"
tunnel="yes"/>
<xsl:with-param name="show-description-text"
select="foundry:get-attribute-value(current(), 'show-description-text', 'true')"
tunnel="yes"/>
</xsl:apply-templates>
</xsl:template>
<xsl:template match="navigation-hierarchy//navigation-links">
<xsl:param name="hierarchy-id" tunnel="yes"/>
<xsl:param name="with-colorset" tunnel="yes"/>
<xsl:param name="show-description-text" tunnel="yes"/>
<xsl:param name="current-level" select="1" tunnel="yes"/>
<xsl:param name="current-level-tree"
select="$data-tree//nav:categoryHierarchy[@id=$hierarchy-id]/nav:category"
tunnel="yes"/>
<xsl:call-template name="foundry:message-debug">
<xsl:with-param name="message"
select="concat('navigation-links template called with these parameters:&#x0A;',
' hierarchy-id = ', $hierarchy-id, '&#x0a;',
' with-colorset = ', $with-colorset, '&#x0a;',
' current-level = ', $current-level, '&#x0a;',
' count(category) = ', count($current-level-tree), '&#x0a;')" />
</xsl:call-template>
<xsl:apply-templates>
<xsl:with-param name="hierarchy-id"
select="$hierarchy-id"
tunnel="yes"/>
<xsl:with-param name="with-colorset"
select="$with-colorset"
tunnel="yes"/>
<xsl:with-param name="show-description-text"
select="$show-description-text"
tunnel="yes"/>
<xsl:with-param name="current-level"
select="$current-level + 1"
tunnel="yes"/>
<xsl:with-param name="current-level-tree"
select="$current-level-tree"
tunnel="yes"/>
<xsl:with-param name="navigation-links-tree"
select="."
tunnel="yes"/>
</xsl:apply-templates>
</xsl:template>
<xsl:template match="navigation-hierarchy//navigation-links//navigation-link">
<xsl:param name="hierarchy-id" tunnel="yes"/>
<xsl:param name="with-colorset" tunnel="yes"/>
<xsl:param name="show-description-text" tunnel="yes"/>
<xsl:param name="current-level" tunnel="yes"/>
<xsl:param name="current-level-tree" tunnel="yes"/>
<xsl:param name="navigation-links-tree" tunnel="yes"/>
<xsl:variable name="link-tree" select="current()"/>
<xsl:for-each select="$current-level-tree">
<xsl:apply-templates select="$link-tree/*">
<xsl:with-param name="navigation-id" select="$hierarchy-id"/>
<xsl:with-param name="hierarchy-id" select="$hierarchy-id"/>
<xsl:with-param name="with-colorset" select="$with-colorset" tunnel="yes"/>
<xsl:with-param name="show-description-text"
select="show-description-text"
tunnel="yes"/>
<xsl:with-param name="current-level" select="$current-level" tunnel="yes"/>
<xsl:with-param name="current-level-tree"
select="current()"
tunnel="yes"/>
<xsl:with-param name="navigation-links-tree"
select="$navigation-links-tree"
tunnel="yes"/>
<xsl:with-param name="href" select="./@url" tunnel="yes"/>
<xsl:with-param name="title" tunnel="yes">
<xsl:choose>
<xsl:when test="$show-description-text and ./@description">
<xsl:value-of select="./@description"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="./@title"/>
</xsl:otherwise>
</xsl:choose>
</xsl:with-param>
<xsl:with-param name="link-label" select="./@title" tunnel="yes"/>
<xsl:with-param name="class">
<xsl:if test="./@isSelected = 'true'">
<xsl:value-of select="'active'"/>
</xsl:if>
<xsl:if test="$current-level = 1 and $with-colorset = true()">
<xsl:value-of select="concat(' colorset-', position())"/>
</xsl:if>
</xsl:with-param>
<xsl:with-param name="id" select="concat('id-', ./@id)"/>
</xsl:apply-templates>
</xsl:for-each>
</xsl:template>
<xsl:template match="navigation-hierarchy//navigation-link//navigation-sublinks">
<xsl:param name="hierarchy-id" tunnel="yes"/>
<xsl:param name="with-colorset" tunnel="yes"/>
<xsl:param name="show-description-text" tunnel="yes"/>
<xsl:param name="current-level" tunnel="yes"/>
<xsl:param name="current-level-tree" tunnel="yes"/>
<xsl:param name="navigation-links-tree" tunnel="yes"/>
<xsl:if test="$current-level-tree/nav:category">
<xsl:apply-templates select="$navigation-links-tree">
<xsl:with-param name="navigation-id" select="$hierarchy-id"/>
<xsl:with-param name="hierarchy-id" select="$hierarchy-id"/>
<xsl:with-param name="with-colorset" select="$with-colorset"/>
<xsl:with-param name="show-description-text" select="$show-description-text"/>
<xsl:with-param name="current-level" select="$current-level + 1"/>
<xsl:with-param name="current-level-tree"
select="$current-level-tree/nav:category"
tunnel="yes"/>
<xsl:with-param name="navigation-links-tree" select="$navigation-links-tree"/>
</xsl:apply-templates>
</xsl:if>
</xsl:template>
<xsl:template match="navigation-hierarchy//navigation-link//if-navigation-sublinks">
<xsl:param name="current-level-tree" tunnel="yes"/>
<xsl:if test="$current-level-tree/nav:category">
<xsl:apply-templates/>
</xsl:if>
</xsl:template>
<!-- Sitemap --> <!-- Sitemap -->
<xsl:template match="nav-sitemap"> <xsl:template match="nav-sitemap">
<xsl:apply-templates select="$data-tree/nav:categoryHierarchy"/> <xsl:apply-templates select="$data-tree/nav:categoryHierarchy"/>
@ -576,4 +756,4 @@
</li> </li>
</xsl:template> </xsl:template>
</xsl:stylesheet> </xsl:stylesheet>

32
ccm-theme-foundry/src/main/resources/themes/foundry/foundry/lib/template-tags/object-list.xsl
View File

@ -77,13 +77,19 @@
</xsl:choose> </xsl:choose>
</xsl:variable> </xsl:variable>
<xsl:if test="count($object-list-datatree/nav:objectList/nav:item) &gt;= 1"> <xsl:apply-templates>
<xsl:apply-templates> <xsl:with-param name="object-list-datatree"
<xsl:with-param name="object-list-datatree" tunnel="yes"
tunnel="yes" select="$object-list-datatree"/>
select="$object-list-datatree"/> </xsl:apply-templates>
</xsl:apply-templates> </xsl:if>
</xsl:if> </xsl:template>
<xsl:template match="object-list/no-content">
<xsl:param name="object-list-datatree" tunnel="yes"/>
<xsl:if test="$object-list-datatree/nav:noContent">
<xsl:apply-templates select="current()/*"/>
</xsl:if> </xsl:if>
</xsl:template> </xsl:template>
@ -164,7 +170,7 @@
<xsl:template match="object-list//paginator"> <xsl:template match="object-list//paginator">
<xsl:param name="object-list-datatree" tunnel="yes"/> <xsl:param name="object-list-datatree" tunnel="yes"/>
<xsl:if test="($object-list-datatree/nav:objectList/nav:paginator/@pageCount &gt; 1) <xsl:if test="(number($object-list-datatree/nav:objectList/nav:paginator/@pageCount) &gt; 1)
or ./@show = 'always'"> or ./@show = 'always'">
<xsl:apply-templates> <xsl:apply-templates>
<xsl:with-param name="paginator-baseurl" <xsl:with-param name="paginator-baseurl"
@ -308,7 +314,7 @@
<xsl:param name="paginator-baseurl" tunnel="yes" select="''"/> <xsl:param name="paginator-baseurl" tunnel="yes" select="''"/>
<xsl:param name="paginator-page-param" tunnel="yes" select="''"/> <xsl:param name="paginator-page-param" tunnel="yes" select="''"/>
<xsl:if test="($paginator-page-number != '') and ($paginator-page-number &gt; 1)"> <xsl:if test="($paginator-page-number != '') and (number($paginator-page-number) &gt; 1)">
<xsl:apply-templates> <xsl:apply-templates>
<xsl:with-param name="href" <xsl:with-param name="href"
tunnel="yes" tunnel="yes"
@ -335,7 +341,7 @@
<xsl:param name="paginator-page-param" tunnel="yes" select="''"/> <xsl:param name="paginator-page-param" tunnel="yes" select="''"/>
<xsl:if test="($paginator-page-number != '') <xsl:if test="($paginator-page-number != '')
and ($paginator-page-number &lt; $paginator-page-count)"> and (number($paginator-page-number) &lt; number($paginator-page-count))">
<xsl:apply-templates> <xsl:apply-templates>
<xsl:with-param name="href" <xsl:with-param name="href"
tunnel="yes" tunnel="yes"
@ -361,7 +367,7 @@
<xsl:param name="paginator-page-param" tunnel="yes" select="''"/> <xsl:param name="paginator-page-param" tunnel="yes" select="''"/>
<xsl:if test="($paginator-page-number != '') <xsl:if test="($paginator-page-number != '')
and ($paginator-page-number &gt; 1)"> and (number($paginator-page-number) &gt; 1)">
<xsl:apply-templates> <xsl:apply-templates>
<xsl:with-param name="href" <xsl:with-param name="href"
tunnel="yes" tunnel="yes"
@ -386,7 +392,7 @@
<xsl:param name="paginator-page-param" tunnel="yes" select="''"/> <xsl:param name="paginator-page-param" tunnel="yes" select="''"/>
<xsl:if test="($paginator-page-number != '') <xsl:if test="($paginator-page-number != '')
and ($paginator-page-number &lt; $paginator-page-count)"> and (number($paginator-page-number) &lt; number($paginator-page-count))">
<xsl:apply-templates> <xsl:apply-templates>
<xsl:with-param name="href" <xsl:with-param name="href"
tunnel="yes" tunnel="yes"
@ -470,4 +476,4 @@
</xsl:choose> </xsl:choose>
</xsl:template> </xsl:template>
</xsl:stylesheet> </xsl:stylesheet>

11
ccm-theme-foundry/src/main/resources/themes/foundry/foundry/lib/utils.xsl
View File

@ -946,6 +946,9 @@
</xsl:function> </xsl:function>
<xsl:function name="foundry:title" as="xs:string"> <xsl:function name="foundry:title" as="xs:string">
<xsl:param name="useCategoryMenu"/>
<xsl:param name="useRootCategoryIndexItemTitle"/>
<xsl:choose> <xsl:choose>
<!-- Use fixed title for some special content items --> <!-- Use fixed title for some special content items -->
<xsl:when test="$data-tree//cms:contentPanel"> <xsl:when test="$data-tree//cms:contentPanel">
@ -983,11 +986,11 @@
<!-- Title for content section--> <!-- Title for content section-->
<xsl:otherwise> <xsl:otherwise>
<xsl:choose> <xsl:choose>
<xsl:when test="$data-tree/nav:categoryMenu//nav:category[@isSelected='true']"> <xsl:when test="$data-tree/nav:categoryMenu[@id=$useCategoryMenu]//nav:category[@isSelected='true']">
<xsl:for-each select="$data-tree/nav:categoryMenu//nav:category[@isSelected='true']"> <xsl:for-each select="$data-tree/nav:categoryMenu[@id=$useCategoryMenu]//nav:category[@isSelected='true']">
<xsl:choose> <xsl:choose>
<!-- Special rule: Use content item title for root-page in navigation --> <!-- Special rule: Use content item title for root-page in navigation -->
<xsl:when test="position() = last() and position() = 1"> <xsl:when test="position() = last() and position() = 1 and $useRootCategoryIndexItemTitle">
<xsl:choose> <xsl:choose>
<xsl:when test="$data-tree//title"> <xsl:when test="$data-tree//title">
<xsl:variable name="page-title"> <xsl:variable name="page-title">
@ -1174,4 +1177,4 @@
</xsl:function> </xsl:function>
</xsl:stylesheet> </xsl:stylesheet>