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

Foundry: Some bugfixes. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@3373 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2015-05-04 16:53:00 +00:00
parent b8c853a23e
commit 637f6759a1
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,14 +63,9 @@
<xsl:template match="note//note-content"> <xsl:template match="note//note-content">
<xsl:param name="note-content" tunnel="yes"/> <xsl:param name="note-content" tunnel="yes"/>
<xsl:choose> <xsl:value-of disable-output-escaping="yes"
<xsl:when test="count($note-content/*) &gt; 0"> select="$note-content"/>
<xsl:copy-of select="$note-content/*"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="$note-content"/>
</xsl:otherwise>
</xsl:choose>
</xsl:template> </xsl:template>
</xsl:stylesheet> </xsl:stylesheet>

29
ccm-core/web/themes/foundry/foundry/lib/template-tags/loaders.xsl
View File

@ -236,15 +236,21 @@
<xsl:when test="contains($filename, '/')"> <xsl:when test="contains($filename, '/')">
<xsl:choose> <xsl:choose>
<xsl:when test="string-length($media) &gt; 0"> <xsl:when test="string-length($media) &gt; 0">
<link rel="stylesheet" <link rel="{foundry:gen-style-rel-value($less, $less-onthefly)}"
type="text/css" type="text/css"
href="{foundry:gen-path($filename, $origin)}" href="{foundry:gen-path(foundry:gen-style-filename($less,
$less-onthefly,
$filename),
$origin)}"
media="{$media}"/> media="{$media}"/>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<link rel="stylesheet" <link rel="{foundry:gen-style-rel-value($less, $less-onthefly)}"
type="text/css" type="text/css"
href="{foundry:gen-path($filename, $origin)}"/> href="{foundry:gen-path(foundry:gen-style-filename($less,
$less-onthefly,
$filename),
$origin)}"/>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:when> </xsl:when>
@ -296,11 +302,20 @@
<xsl:param name="filename" as="xs:string"/> <xsl:param name="filename" as="xs:string"/>
<xsl:choose> <xsl:choose>
<xsl:when test="$less and $less-onthefly and foundry:debug-enabled()"> <xsl:when test="$less = true()">
<xsl:value-of select="concat($filename, '.less')"/> <xsl:choose>
<xsl:when test="($less = true())
and ($less-onthefly = true())
and (foundry:debug-enabled() = true())">
<xsl:value-of select="concat($filename, '.less')"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="concat($filename, '.css')"/>
</xsl:otherwise>
</xsl:choose>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:value-of select="concat($filename, '.css')"/> <xsl:value-of select="$filename"/>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:function> </xsl:function>