- Fixed a typo in PDL-Query in ccm-sci-types-project
- Foundry support for ccm-sci-types-institute and ccm-sci-types-department git-svn-id: https://svn.libreccm.org/ccm/trunk@3332 8810af33-2d31-482b-a856-94f89814c4dfmaster
jensp
parent
dd4d3783f1
commit
653933bb74
|
|
@ -41,6 +41,8 @@
|
|||
<xsl:import href="content-items/mpa.xsl"/>
|
||||
<xsl:import href="content-items/news.xsl"/>
|
||||
<xsl:import href="content-items/person.xsl"/>
|
||||
<xsl:import href="content-items/scidepartment.xsl"/>
|
||||
<xsl:import href="content-items/sciinstitute.xsl"/>
|
||||
<xsl:import href="content-items/sciorga.xsl"/>
|
||||
<xsl:import href="content-items/sciproject.xsl"/>
|
||||
<xsl:import href="content-items/siteproxy.xsl"/>
|
||||
|
|
|
|||
|
|
@ -108,9 +108,9 @@
|
|||
|
||||
<xsl:template match="content-item-layout//*[ends-with(name(), 'contact-entries')]//contact-entry">
|
||||
<xsl:param name="contact-entries" tunnel="yes"/>
|
||||
|
||||
|
||||
<xsl:variable name="keyId" select="./@key"/>
|
||||
|
||||
|
||||
<xsl:if test="$contact-entries[./keyId = $keyId]">
|
||||
<xsl:apply-templates>
|
||||
<xsl:with-param name="label"
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@
|
|||
<xsl:param name="contentitem-tree" tunnel="yes"/>
|
||||
|
||||
<xsl:variable name="selected-tab"
|
||||
select="$contentitem-tree/orgaUnitTabs/availableTabs/availableTab[@selected='true']/@label"/>
|
||||
select="$contentitem-tree/orgaUnitTabs/availableTabs/*[@selected='true']/@label"/>
|
||||
|
||||
<xsl:apply-templates select="./tab[@name=$selected-tab]/*">
|
||||
<xsl:with-param name="orgaunit-data"
|
||||
|
|
@ -123,7 +123,7 @@
|
|||
</xsl:apply-templates>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//members//member">
|
||||
<xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//*[ends-with(name(), 'members')]//member">
|
||||
<xsl:param name="members" tunnel="yes"/>
|
||||
|
||||
<xsl:variable name="layout-tree" select="./*"/>
|
||||
|
|
@ -143,7 +143,7 @@
|
|||
</xsl:for-each>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//members//member//member-status">
|
||||
<xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//*[ends-with(name(), 'members')]//member//member-status">
|
||||
<xsl:param name="member-status" tunnel="yes"/>
|
||||
<xsl:param name="orgaunit-type-name" tunnel="yes"/>
|
||||
|
||||
|
|
@ -152,7 +152,7 @@
|
|||
</xsl:if>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//members//member//member-role">
|
||||
<xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//*[ends-with(name(), 'members')]//member//member-role">
|
||||
<xsl:param name="member-role" tunnel="yes"/>
|
||||
<xsl:param name="orgaunit-type-name" tunnel="yes"/>
|
||||
|
||||
|
|
@ -161,7 +161,24 @@
|
|||
</xsl:if>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//members//member//if-member-role-is">
|
||||
<xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//*[ends-with(name(), 'members')]//member//member-contact-entries">
|
||||
<xsl:param name="person" tunnel="yes"/>
|
||||
|
||||
<xsl:variable name="contact-type"
|
||||
select="if(./@contact-type)
|
||||
then ./@contact-type
|
||||
else 'commonContact'"/>
|
||||
|
||||
<xsl:if test="$person/contacts/contact[@contactType = $contact-type]/contactentries">
|
||||
<xsl:apply-templates>
|
||||
<xsl:with-param name="contact-entries"
|
||||
tunnel="yes"
|
||||
select="$person/contacts/contact[@contactType = $contact-type]/contactentries"/>
|
||||
</xsl:apply-templates>
|
||||
</xsl:if>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//*[ends-with(name(), 'members')]//member//if-member-role-is">
|
||||
<xsl:param name="member-role" tunnel="yes"/>
|
||||
|
||||
<xsl:if test="$member-role = ./@role">
|
||||
|
|
|
|||
|
|
@ -0,0 +1,59 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2015 Jens Pelzetter for the LibreCCM Foundation
|
||||
|
||||
This file is part of the Foundry Theme Engine for LibreCCM
|
||||
|
||||
Foundry is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
Foundry is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Foundry If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
-->
|
||||
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
|
||||
xmlns:xs="http://www.w3.org/2001/XMLSchema"
|
||||
xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
|
||||
xmlns:cms="http://www.arsdigita.com/cms/1.0"
|
||||
xmlns:foundry="http://foundry.libreccm.org"
|
||||
xmlns:nav="http://ccm.redhat.com/navigation"
|
||||
xmlns:ui="http://www.arsdigita.com/ui/1.0"
|
||||
exclude-result-prefixes="xsl xs bebop cms foundry nav ui"
|
||||
version="2.0">
|
||||
|
||||
<xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//scidepartment-desc">
|
||||
<xsl:param name="orgaunit-data" tunnel="yes"/>
|
||||
|
||||
<xsl:choose>
|
||||
<xsl:when test="$orgaunit-data/departmentDescription">
|
||||
<xsl:value-of disable-output-escaping="yes"
|
||||
select="$orgaunit-data/departmentDescription"/>
|
||||
</xsl:when>
|
||||
<xsl:when test="$orgaunit-data/description">
|
||||
<xsl:value-of disable-output-escaping="yes"
|
||||
select="$orgaunit-data/description"/>
|
||||
</xsl:when>
|
||||
</xsl:choose>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//scidepartment-shortdesc">
|
||||
<xsl:param name="orgaunit-data" tunnel="yes"/>
|
||||
|
||||
<xsl:choose>
|
||||
<xsl:when test="$orgaunit-data/departmentShortDescription">
|
||||
<xsl:value-of select="$orgaunit-data/departmentShortDescription"/>
|
||||
</xsl:when>
|
||||
<xsl:when test="$orgaunit-data/shortDesc">
|
||||
<xsl:value-of select="$orgaunit-data/shortDescription"/>
|
||||
</xsl:when>
|
||||
</xsl:choose>
|
||||
</xsl:template>
|
||||
|
||||
</xsl:stylesheet>
|
||||
|
|
@ -0,0 +1,70 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2015 Jens Pelzetter for the LibreCCM Foundation
|
||||
|
||||
This file is part of the Foundry Theme Engine for LibreCCM
|
||||
|
||||
Foundry is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
Foundry is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Foundry If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
-->
|
||||
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
|
||||
xmlns:xs="http://www.w3.org/2001/XMLSchema"
|
||||
xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
|
||||
xmlns:cms="http://www.arsdigita.com/cms/1.0"
|
||||
xmlns:foundry="http://foundry.libreccm.org"
|
||||
xmlns:nav="http://ccm.redhat.com/navigation"
|
||||
xmlns:ui="http://www.arsdigita.com/ui/1.0"
|
||||
exclude-result-prefixes="xsl xs bebop cms foundry nav ui"
|
||||
version="2.0">
|
||||
|
||||
<xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//sciinstitute-desc">
|
||||
<xsl:param name="orgaunit-data" tunnel="yes"/>
|
||||
|
||||
<xsl:choose>
|
||||
<xsl:when test="$orgaunit-data/instituteDesc">
|
||||
<xsl:value-of disable-output-escaping="yes"
|
||||
select="$orgaunit-data/instituteDescription"/>
|
||||
</xsl:when>
|
||||
<xsl:when test="$orgaunit-data/description">
|
||||
<xsl:value-of disable-output-escaping="yes"
|
||||
select="$orgaunit-data/description"/>
|
||||
</xsl:when>
|
||||
</xsl:choose>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//sciinstitute-members">
|
||||
<xsl:param name="orgaunit-data" tunnel="yes"/>
|
||||
|
||||
<xsl:apply-templates>
|
||||
<xsl:with-param name="members"
|
||||
tunnel="yes"
|
||||
select="$orgaunit-data"/>
|
||||
</xsl:apply-templates>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//sciinstitute-shortdesc">
|
||||
<xsl:param name="orgaunit-data" tunnel="yes"/>
|
||||
|
||||
<xsl:choose>
|
||||
<xsl:when test="$orgaunit-data/instituteShortDescription">
|
||||
<xsl:value-of select="$orgaunit-data/instituteShortDescription"/>
|
||||
</xsl:when>
|
||||
<xsl:when test="$orgaunit-data/shortDesc">
|
||||
<xsl:value-of select="$orgaunit-data/shortDescription"/>
|
||||
</xsl:when>
|
||||
</xsl:choose>
|
||||
</xsl:template>
|
||||
|
||||
|
||||
</xsl:stylesheet>
|
||||
|
|
@ -50,7 +50,7 @@ query getIdsOfProjectsOfOrgaUnit {
|
|||
cms_orgaunits_hierarchy_map.superior_orgaunit_id
|
||||
from ct_sci_project_bundles
|
||||
join cms_items on ct_sci_project_bundles.bundle_id = cms_items.item_id
|
||||
join cms_orgunits_hierarchy_map on ct_sci_project_bundles.bundle_id = cms_orgaunits_hierarchy_map.subordinate_orgaunit_id
|
||||
join cms_orgaunits_hierarchy_map on ct_sci_project_bundles.bundle_id = cms_orgaunits_hierarchy_map.subordinate_orgaunit_id
|
||||
where cms_orgaunits_hierarchy_map.assoc_type = 'ProjectOf'
|
||||
and cms_orgaunits_hierarchy_map.superior_orgaunit_id in :orgaunitIds
|
||||
} map {
|
||||
|
|
|
|||
Loading…
Reference in New Issue