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

Removed append-language-parameter from Foundry (introduced in revsion r4897) because that did not work. Better solution was added in the last revisions. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@4974 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2017-09-01 12:17:15 +00:00
parent ce1f4aa3e2
commit 9cdab4335c
5 changed files with 8 additions and 63 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.xsl
View File

@ -250,7 +250,7 @@
</xsl:call-template> </xsl:call-template>
</xsl:when> </xsl:when>
<xsl:when test="$template-map/content-item[@content-section = $content-section <xsl:when test="$template-map/content-item[@content-section = $content-section
and @category = $category and @category = $category
and not(@style) and not(@style)
and not(@content-type)]"> and not(@content-type)]">
@ -991,14 +991,7 @@
<xsl:function name="foundry:generate-contentitem-link"> <xsl:function name="foundry:generate-contentitem-link">
<xsl:param name="oid"/> <xsl:param name="oid"/>
<xsl:choose> <xsl:sequence select="concat($context-prefix, '/redirect/?oid=', $oid)"/>
<xsl:when test="foundry:get-setting('appendLanguageParameter', '') = 'true'">
<xsl:sequence select="concat($context-prefix, '/redirect/?oid=', $oid, '&amp;lang=', $negotiated-language)"/>
</xsl:when>
<xsl:otherwise>
<xsl:sequence select="concat($context-prefix, '/redirect/?oid=', $oid)"/>
</xsl:otherwise>
</xsl:choose>
</xsl:function> </xsl:function>

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

@ -123,9 +123,6 @@
'/redirect/?oid=', '/redirect/?oid=',
./targetItem/@oid, ./targetItem/@oid,
$params)"/> $params)"/>
<xsl:with-param name="append-language-parameter"
tunnel="yes"
select="'true'"/>
<xsl:with-param name="target-item-title" <xsl:with-param name="target-item-title"
tunnel="yes" tunnel="yes"
select="./targetItem/title"/> select="./targetItem/title"/>

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

@ -359,9 +359,6 @@
./formatKey, ./formatKey,
'&amp;publication=', '&amp;publication=',
./publicationId)"/> ./publicationId)"/>
<xsl:with-param name="append-language-parameter"
tunnel="yes"
select="'true'" />
<xsl:with-param name="export-formatkey" <xsl:with-param name="export-formatkey"
tunnel="yes" tunnel="yes"
select="./formatKey"/> select="./formatKey"/>

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

@ -144,7 +144,6 @@
<xsl:param name="hreflang" select="''" tunnel="yes"/> <xsl:param name="hreflang" select="''" tunnel="yes"/>
<xsl:param name="title" select="''" tunnel="yes"/> <xsl:param name="title" select="''" tunnel="yes"/>
<xsl:param name="type" select="''" tunnel="yes"/> <xsl:param name="type" select="''" tunnel="yes"/>
<xsl:param name="append-language-parameter" select="false"/>
<a> <a>
<xsl:if test="./@href-property"> <xsl:if test="./@href-property">
@ -166,21 +165,7 @@
</xsl:if> </xsl:if>
<xsl:if test="$href != ''"> <xsl:if test="$href != ''">
<xsl:attribute name="href"> <xsl:attribute name="href">
<xsl:choose> <xsl:value-of select="$href"/>
<xsl:when test="$append-language-parameter = 'true' and foundry:get-setting('append-language-parameter', '') = 'true'">
<xsl:choose>
<xsl:when test="contains($href, '?')">
<xsl:value-of select="concat($href, '&amp;lang=', $negotiated-language)"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="concat($href, '?lang=', $negotiated-language)" />
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="$href"/>
</xsl:otherwise>
</xsl:choose>
</xsl:attribute> </xsl:attribute>
</xsl:if> </xsl:if>
<xsl:if test="string-length($hreflang) &gt; 0"> <xsl:if test="string-length($hreflang) &gt; 0">
@ -1688,12 +1673,12 @@
</foundry:doc> </foundry:doc>
<xsl:template match="head/link"> <xsl:template match="head/link">
<link> <link>
<xsl:call-template name="foundry:process-layouttree-attributes"> <xsl:call-template name="foundry:process-layouttree-attributes">
<xsl:with-param name="copy-attributes" select="'crossorigin rel rev media hreflang type sizes'" /> <xsl:with-param name="copy-attributes" select="'crossorigin rel rev media hreflang type sizes'" />
</xsl:call-template> </xsl:call-template>
<xsl:if test="./@href"> <xsl:if test="./@href">
<xsl:attribute name="href" select="foundry:gen-path(./@href)" /> <xsl:attribute name="href" select="foundry:gen-path(./@href)" />
</xsl:if> </xsl:if>
</link> </link>
</xsl:template> </xsl:template>

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

@ -80,9 +80,6 @@
<xsl:with-param name="breadcrumb-label" <xsl:with-param name="breadcrumb-label"
tunnel="yes" tunnel="yes"
select="foundry:get-static-text('breadcrumbs', 'root')"/> select="foundry:get-static-text('breadcrumbs', 'root')"/>
<xsl:with-param name="append-language-parameter"
tunnel="yes"
select="'true'" />
</xsl:apply-templates> </xsl:apply-templates>
<xsl:if test="count($data-tree//nav:categoryPath/nav:category) &gt; 1"> <xsl:if test="count($data-tree//nav:categoryPath/nav:category) &gt; 1">
<xsl:copy-of select="$breadcrumb-separator/*"/> <xsl:copy-of select="$breadcrumb-separator/*"/>
@ -102,9 +99,6 @@
</xsl:choose> </xsl:choose>
</xsl:with-param> </xsl:with-param>
<xsl:with-param name="breadcrumb-label" tunnel="yes" select="./@title"/> <xsl:with-param name="breadcrumb-label" tunnel="yes" select="./@title"/>
<xsl:with-param name="append-language-parameter"
tunnel="yes"
select="'true'" />
</xsl:apply-templates> </xsl:apply-templates>
<xsl:if test="position() != last()"> <xsl:if test="position() != last()">
<xsl:copy-of select="$breadcrumb-separator/*"/> <xsl:copy-of select="$breadcrumb-separator/*"/>
@ -154,9 +148,6 @@
<xsl:with-param name="href" <xsl:with-param name="href"
tunnel="yes" tunnel="yes"
select="$data-tree//nav:categoryPath/nav:category[position() = 2]/@url"/> select="$data-tree//nav:categoryPath/nav:category[position() = 2]/@url"/>
<xsl:with-param name="append-language-parameter"
tunnel="yes"
select="'true'" />
</xsl:apply-templates> </xsl:apply-templates>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
@ -165,9 +156,6 @@
<xsl:with-param name="href" <xsl:with-param name="href"
tunnel="yes" tunnel="yes"
select="$data-tree//nav:categoryPath/nav:category[position() = 1]/@url"/> select="$data-tree//nav:categoryPath/nav:category[position() = 1]/@url"/>
<xsl:with-param name="append-language-parameter"
tunnel="yes"
select="'true'" />
</xsl:apply-templates> </xsl:apply-templates>
</xsl:if> </xsl:if>
</xsl:otherwise> </xsl:otherwise>
@ -220,9 +208,6 @@
</xsl:when> </xsl:when>
</xsl:choose> </xsl:choose>
</xsl:with-param> </xsl:with-param>
<xsl:with-param name="append-language-parameter"
tunnel="yes"
select="'true'" />
<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>
@ -465,9 +450,6 @@
select="$navigation-links-tree" select="$navigation-links-tree"
tunnel="yes"/> tunnel="yes"/>
<xsl:with-param name="href" select="./@url" tunnel="yes"/> <xsl:with-param name="href" select="./@url" tunnel="yes"/>
<xsl:with-param name="append-language-parameter"
tunnel="yes"
select="'true'"/>
<xsl:with-param name="title" tunnel="yes"> <xsl:with-param name="title" tunnel="yes">
<xsl:choose> <xsl:choose>
<xsl:when test="$show-description-text and ./@description"> <xsl:when test="$show-description-text and ./@description">
@ -508,9 +490,6 @@
select="$navigation-links-tree" select="$navigation-links-tree"
tunnel="yes"/> tunnel="yes"/>
<xsl:with-param name="href" select="./@url" tunnel="yes"/> <xsl:with-param name="href" select="./@url" tunnel="yes"/>
<xsl:with-param name="append-language-parameter"
tunnel="yes"
select="'true'" />
<xsl:with-param name="title" tunnel="yes"> <xsl:with-param name="title" tunnel="yes">
<xsl:choose> <xsl:choose>
<xsl:when test="$show-description-text and ./@description"> <xsl:when test="$show-description-text and ./@description">
@ -594,9 +573,6 @@
<xsl:with-param name="href" <xsl:with-param name="href"
tunnel="yes" tunnel="yes"
select="./nav:url"/> select="./nav:url"/>
<xsl:with-param name="append-language-parameter"
tunnel="yes"
select="'true'"/>
<xsl:with-param name="quicklink-description" <xsl:with-param name="quicklink-description"
tunnel="yes" tunnel="yes"
select="./nav:description"/> select="./nav:description"/>
@ -698,9 +674,6 @@
select="$navigation-links-tree" select="$navigation-links-tree"
tunnel="yes"/> tunnel="yes"/>
<xsl:with-param name="href" select="./@url" tunnel="yes"/> <xsl:with-param name="href" select="./@url" tunnel="yes"/>
<xsl:with-param name="append-language-parameter"
tunnel="yes"
select="'true'" />
<xsl:with-param name="title" tunnel="yes"> <xsl:with-param name="title" tunnel="yes">
<xsl:choose> <xsl:choose>
<xsl:when test="$show-description-text and ./@description"> <xsl:when test="$show-description-text and ./@description">