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

Foundry now supports paramters in internal related links. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@3080 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2015-01-16 17:34:21 +00:00
parent c431141540
commit 2ed7b938bc
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,12 +47,26 @@
<xsl:choose> <xsl:choose>
<xsl:when test="./targetType = 'internalLink'"> <xsl:when test="./targetType = 'internalLink'">
<xsl:variable name="params">
<xsl:choose>
<xsl:when test="starts-with(./targetURI, '&amp;?')">
<xsl:value-of select="concat('&amp;', substring(./targetURI, 3))"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="./targetURI"/>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:apply-templates select="$links-layout-tree/internal/*"> <xsl:apply-templates select="$links-layout-tree/internal/*">
<xsl:with-param name="link-title" tunnel="yes" select="./linkTitle"/> <xsl:with-param name="link-title" tunnel="yes" select="./linkTitle"/>
<xsl:with-param name="link-desc" tunnel="yes" select="./linkDescription"/> <xsl:with-param name="link-desc" tunnel="yes" select="./linkDescription"/>
<xsl:with-param name="href" <xsl:with-param name="href"
tunnel="yes" tunnel="yes"
select="concat($context-prefix, '/redirect/?oid=', ./targetItem/@oid)"/> select="concat($context-prefix,
'/redirect/?oid=',
./targetItem/@oid,
$params)"/>
<xsl:with-param name="target-item-title" <xsl:with-param name="target-item-title"
tunnel="yes" tunnel="yes"
select="./targetItem/title"/> select="./targetItem/title"/>

4
ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
View File

@ -1489,7 +1489,9 @@
<xsl:with-param name="copy-attributes" <xsl:with-param name="copy-attributes"
select="'type accept autocomplete autofocus checked disabled multiple name required size spellcheck tabindex'"/> select="'type accept autocomplete autofocus checked disabled multiple name required size spellcheck tabindex'"/>
</xsl:call-template> </xsl:call-template>
<xsl:attribute name="value" select="$value"/> <xsl:attribute name="value" select="if($value = '' and ./@value)
then ./@value
else $value"/>
<xsl:choose> <xsl:choose>
<xsl:when test="./@placeholder and ./@placeholder-module"> <xsl:when test="./@placeholder and ./@placeholder-module">