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

Some small fixes for Foundry 

git-svn-id: https://svn.libreccm.org/ccm/trunk@3015 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2014-12-07 14:26:12 +00:00
parent 4637174483
commit 39d22f957e
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ccm-core/web/themes/foundry/foundry/lib/template-parser.xsl
View File

@ -87,9 +87,9 @@
</foundry:doc-desc>
</foundry:doc>
<xsl:template match="fragment-layout">
<div class="ccm-fragment">
<xsl:apply-templates/>
</div>
<xsl:apply-templates/>
</xsl:template>
<foundry:doc section="user" type="template-tag">
@ -316,9 +316,8 @@
</foundry:doc>
<xsl:function name="foundry:get-colorset" as="xs:string">
<xsl:for-each select="$data-tree/nav:categoryMenu/nav:category/nav:category">
<xsl:if test="@isSelected = 'true'">
<xsl:text>colorset_</xsl:text>
<xsl:value-of select="position()"/>
<xsl:if test="./@isSelected = 'true'">
<xsl:value-of select="concat('colorset-', position())"/>
</xsl:if>
</xsl:for-each>
</xsl:function>
@ -576,7 +575,7 @@
</xsl:variable>
<xsl:variable name="color-class">
<xsl:if test="$current-layout-node/@with-colorset='true'">
<xsl:if test="foundry:boolean($current-layout-node/@with-colorset)">
<xsl:value-of select="foundry:get-colorset()"/>
</xsl:if>
</xsl:variable>

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

@ -253,7 +253,7 @@
select="foundry:get-attribute-value(current(), 'navigation-id', 'categoryMenu')"
tunnel="yes"/>
<xsl:with-param name="with-colorset"
select="foundry:get-attribute-value(current(), 'with-colorset', 'false')"
select="foundry:boolean(foundry:get-attribute-value(current(), 'with-colorset', 'false'))"
tunnel="yes"/>
<xsl:with-param name="min-level"
select="foundry:get-attribute-value(current(), 'min-level', 1)"