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

Some bugfixes for Foundry 

git-svn-id: https://svn.libreccm.org/ccm/trunk@3567 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2015-08-12 11:23:53 +00:00
parent 6904c2ad79
commit 8a14da390a
3 changed files with 178 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -154,6 +154,7 @@
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:with-param> </xsl:with-param>
<xsl:with-param name="style" select="./@style" />
</xsl:call-template> </xsl:call-template>
</xsl:if> </xsl:if>
@ -162,6 +163,7 @@
<xsl:template name="process-content-item-detail"> <xsl:template name="process-content-item-detail">
<xsl:param name="contentitem-tree"/> <xsl:param name="contentitem-tree"/>
<xsl:param name="content-section" select="''"/> <xsl:param name="content-section" select="''"/>
<xsl:param name="style" select="''"/>
<xsl:param name="mode" select="'detail'"/> <xsl:param name="mode" select="'detail'"/>
<xsl:variable name="oid" select="$contentitem-tree/masterVersion/@oid"/> <xsl:variable name="oid" select="$contentitem-tree/masterVersion/@oid"/>
@ -204,24 +206,58 @@
<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 @style = $style
and @content-type = $content-type]"> and @content-type = $content-type]">
<xsl:call-template name="foundry:process-contentitem-template"> <xsl:call-template name="foundry:process-contentitem-template">
<xsl:with-param name="template-file" <xsl:with-param name="template-file"
select="$template-map/content-item[@content-section = $content-section select="$template-map/content-item[@content-section = $content-section
and @category = $category and @category = $category
and @style = $style
and @content-type = $content-type]"/> and @content-type = $content-type]"/>
<xsl:with-param name="contentitem-tree" <xsl:with-param name="contentitem-tree"
select="$contentitem-tree"/> select="$contentitem-tree"/>
</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 @content-type = $content-type]">
<xsl:call-template name="foundry:process-contentitem-template">
<xsl:with-param name="template-file"
select="$template-map/content-item[@content-section = $content-section
and @category = $category
and not(@style)
and @content-type = $content-type]"/>
<xsl:with-param name="contentitem-tree"
select="$contentitem-tree"/>
</xsl:call-template>
</xsl:when>
<xsl:when test="$template-map/content-item[@content-section = $content-section
and @category = $category
and @style = $style
and not(@content-type)]"> and not(@content-type)]">
<xsl:call-template name="foundry:process-contentitem-template"> <xsl:call-template name="foundry:process-contentitem-template">
<xsl:with-param name="template-file" <xsl:with-param name="template-file"
select="$template-map/content-item[@content-section = $content-section select="$template-map/content-item[@content-section = $content-section
and @category = $category and @category = $category
and @style = $style
and not(@content-type)]"/>
<xsl:with-param name="contentitem-tree"
select="$contentitem-tree"/>
</xsl:call-template>
</xsl:when>
<xsl:when test="$template-map/content-item[@content-section = $content-section
and @category = $category
and not(@style)
and not(@content-type)]">
<xsl:call-template name="foundry:process-contentitem-template">
<xsl:with-param name="template-file"
select="$template-map/content-item[@content-section = $content-section
and @category = $category
and not(@style)
and not(@content-type)]"/> and not(@content-type)]"/>
<xsl:with-param name="contentitem-tree" <xsl:with-param name="contentitem-tree"
select="$contentitem-tree"/> select="$contentitem-tree"/>
@ -230,11 +266,28 @@
<xsl:when test="$template-map/content-item[@content-section = $content-section <xsl:when test="$template-map/content-item[@content-section = $content-section
and not(@category) and not(@category)
and @style = $style
and @content-type = $content-type]"> and @content-type = $content-type]">
<xsl:call-template name="foundry:process-contentitem-template"> <xsl:call-template name="foundry:process-contentitem-template">
<xsl:with-param name="template-file" <xsl:with-param name="template-file"
select="$template-map/content-item[@content-section = $content-section select="$template-map/content-item[@content-section = $content-section
and not(@category) and not(@category)
and @style = $style
and @content-type = $content-type]"/>
<xsl:with-param name="contentitem-tree"
select="$contentitem-tree"/>
</xsl:call-template>
</xsl:when>
<xsl:when test="$template-map/content-item[@content-section = $content-section
and not(@category)
and not(@style)
and @content-type = $content-type]">
<xsl:call-template name="foundry:process-contentitem-template">
<xsl:with-param name="template-file"
select="$template-map/content-item[@content-section = $content-section
and not(@category)
and not(@style)
and @content-type = $content-type]"/> and @content-type = $content-type]"/>
<xsl:with-param name="contentitem-tree" <xsl:with-param name="contentitem-tree"
select="$contentitem-tree"/> select="$contentitem-tree"/>
@ -243,11 +296,28 @@
<xsl:when test="$template-map/content-item[@content-section = $content-section <xsl:when test="$template-map/content-item[@content-section = $content-section
and not(@category) and not(@category)
and @style = $style
and not(@content-type)]"> and not(@content-type)]">
<xsl:call-template name="foundry:process-contentitem-template"> <xsl:call-template name="foundry:process-contentitem-template">
<xsl:with-param name="template-file" <xsl:with-param name="template-file"
select="$template-map/content-item[@content-section = $content-section select="$template-map/content-item[@content-section = $content-section
and not(@category) and not(@category)
and @style = $style
and not(@content-type)]"/>
<xsl:with-param name="contentitem-tree"
select="$contentitem-tree"/>
</xsl:call-template>
</xsl:when>
<xsl:when test="$template-map/content-item[@content-section = $content-section
and not(@category)
and not(@style)
and not(@content-type)]">
<xsl:call-template name="foundry:process-contentitem-template">
<xsl:with-param name="template-file"
select="$template-map/content-item[@content-section = $content-section
and not(@category)
and not(@style)
and not(@content-type)]"/> and not(@content-type)]"/>
<xsl:with-param name="contentitem-tree" <xsl:with-param name="contentitem-tree"
select="$contentitem-tree"/> select="$contentitem-tree"/>
@ -256,11 +326,28 @@
<xsl:when test="$template-map/content-item[not(@content-section) <xsl:when test="$template-map/content-item[not(@content-section)
and @category = $category and @category = $category
and @style = $style
and @content-type = $content-type]"> and @content-type = $content-type]">
<xsl:call-template name="foundry:process-contentitem-template"> <xsl:call-template name="foundry:process-contentitem-template">
<xsl:with-param name="template-file" <xsl:with-param name="template-file"
select="$template-map/content-item[not(@content-section) select="$template-map/content-item[not(@content-section)
and @category = $category and @category = $category
and @style = $style
and @content-type = $content-type]"/>
<xsl:with-param name="contentitem-tree"
select="$contentitem-tree"/>
</xsl:call-template>
</xsl:when>
<xsl:when test="$template-map/content-item[not(@content-section)
and @category = $category
and not(@style)
and @content-type = $content-type]">
<xsl:call-template name="foundry:process-contentitem-template">
<xsl:with-param name="template-file"
select="$template-map/content-item[not(@content-section)
and @category = $category
and not(@style)
and @content-type = $content-type]"/> and @content-type = $content-type]"/>
<xsl:with-param name="contentitem-tree" <xsl:with-param name="contentitem-tree"
select="$contentitem-tree"/> select="$contentitem-tree"/>
@ -269,24 +356,58 @@
<xsl:when test="$template-map/content-item[not(@content-section) <xsl:when test="$template-map/content-item[not(@content-section)
and @category = $category and @category = $category
and @style = $style
and not(@content-type)]"> and not(@content-type)]">
<xsl:call-template name="foundry:process-contentitem-template"> <xsl:call-template name="foundry:process-contentitem-template">
<xsl:with-param name="template-file" <xsl:with-param name="template-file"
select="$template-map/content-item[not(@content-section) select="$template-map/content-item[not(@content-section)
and @category = $category and @category = $category
and @style = $style
and not(@content-type)]"/> and not(@content-type)]"/>
<xsl:with-param name="contentitem-tree" <xsl:with-param name="contentitem-tree"
select="$contentitem-tree"/> select="$contentitem-tree"/>
</xsl:call-template> </xsl:call-template>
</xsl:when> </xsl:when>
<xsl:when test="$template-map/content-item[not(@content-section)
and @category = $category
and not(@style)
and not(@content-type)]">
<xsl:call-template name="foundry:process-contentitem-template">
<xsl:with-param name="template-file"
select="$template-map/content-item[not(@content-section)
and @category = $category
and not(@style)
and not(@content-type)]"/>
<xsl:with-param name="contentitem-tree"
select="$contentitem-tree"/>
</xsl:call-template>
</xsl:when>
<xsl:when test="$template-map/content-item[not(@content-section) <xsl:when test="$template-map/content-item[not(@content-section)
and not(@category) and not(@category)
and @style = $style
and @content-type = $content-type]"> and @content-type = $content-type]">
<xsl:call-template name="foundry:process-contentitem-template"> <xsl:call-template name="foundry:process-contentitem-template">
<xsl:with-param name="template-file" <xsl:with-param name="template-file"
select="$template-map/content-item[not(@content-section) select="$template-map/content-item[not(@content-section)
and not(@category) and not(@category)
and @style = $style
and @content-type = $content-type]"/>
<xsl:with-param name="contentitem-tree"
select="$contentitem-tree"/>
</xsl:call-template>
</xsl:when>
<xsl:when test="$template-map/content-item[not(@content-section)
and not(@category)
and not(@style)
and @content-type = $content-type]">
<xsl:call-template name="foundry:process-contentitem-template">
<xsl:with-param name="template-file"
select="$template-map/content-item[not(@content-section)
and not(@category)
and not(@style)
and @content-type = $content-type]"/> and @content-type = $content-type]"/>
<xsl:with-param name="contentitem-tree" <xsl:with-param name="contentitem-tree"
select="$contentitem-tree"/> select="$contentitem-tree"/>

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

@ -307,7 +307,8 @@
select="concat($dispatcher-prefix, select="concat($dispatcher-prefix,
'/scipublications/export/?format=', '/scipublications/export/?format=',
./formatKey, ./formatKey,
'&amp;publication=', ./publicationId)"/> '&amp;publication=',
./publicationId)"/>
<xsl:with-param name="export-formatkey" <xsl:with-param name="export-formatkey"
tunnel="yes" tunnel="yes"
select="./formatKey"/> select="./formatKey"/>
@ -720,14 +721,14 @@
</xsl:for-each> </xsl:for-each>
</xsl:template> </xsl:template>
<xsl:template match="content-item-layout//scipublications//procedings-papers"> <xsl:template match="content-item-layout//scipublications//proceedings-papers">
<xsl:param name="contentitem-tree" tunnel="yes"/> <xsl:param name="contentitem-tree" tunnel="yes"/>
<xsl:if test="$contentitem-tree/papers"> <xsl:if test="$contentitem-tree/papers">
<xsl:apply-templates> <xsl:apply-templates>
<xsl:with-param name="papers" <xsl:with-param name="papers"
tunnel="yes" tunnel="yes"
select="$contentitem-tree/papers"/> select="$contentitem-tree/papers"/>
</xsl:apply-templates> </xsl:apply-templates>
</xsl:if> </xsl:if>
</xsl:template> </xsl:template>
@ -772,4 +773,48 @@
</xsl:for-each> </xsl:for-each>
</xsl:template> </xsl:template>
<xsl:template match="scipublications-export-links">
<xsl:if test="$data-tree//publicationExportLinks">
<xsl:apply-templates>
<xsl:with-param name="export-links"
tunnel="yes"
select="$data-tree//publicationExportLinks"/>
</xsl:apply-templates>
</xsl:if>
</xsl:template>
<xsl:template match="scipublications-export-links//export-link">
<xsl:param name="export-links" tunnel="yes"/>
<xsl:variable name="layout-tree" select="./*"/>
<xsl:for-each select="$export-links/publicationExportLink">
<xsl:apply-templates select="$layout-tree">
<xsl:with-param name="href"
tunnel="yes"
select="concat($dispatcher-prefix,
'/scipublications/export/?format=',
./formatKey,
'&amp;category=',
./categoryId,
'&amp;filter=',
./filterSql,
'&amp;descendCategories=',
./descendCategories)"/>
<xsl:with-param name="export-formatkey"
tunnel="yes"
select="./formatKey" />
<xsl:with-param name="export-formatname"
tunnel="yes"
select="./formatName"/>
</xsl:apply-templates>
</xsl:for-each>
</xsl:template>
<xsl:template match="scipublications-export-links//export-link//export-link-formatname">
<xsl:param name="export-formatname" tunnel="yes"/>
<xsl:value-of select="$export-formatname"/>
</xsl:template>
</xsl:stylesheet> </xsl:stylesheet>

6
ccm-core/web/themes/foundry/foundry/lib/template-tags/object-list.xsl
View File

@ -398,6 +398,12 @@
</xsl:if> </xsl:if>
</xsl:template> </xsl:template>
<xsl:template match="object-list//filter-controls">
<xsl:apply-templates select="$data-tree//filterControls" />
</xsl:template>
<xsl:template match="filters"> <xsl:template match="filters">
<xsl:if test="$data-tree//filters"> <xsl:if test="$data-tree//filters">
<xsl:apply-templates> <xsl:apply-templates>