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

- ccm-cms-types-pressrelease is now supported by foundry-base using generic template tags 

- some tweaks for the generic show-property tag in Foundry. Added a disable-output-escaping attribute


git-svn-id: https://svn.libreccm.org/ccm/trunk@3010 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2014-12-05 19:43:57 +00:00
parent 3ae747e8b8
commit c531b6bbcc
5 changed files with 92 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ccm-core/web/themes/foundry-base/conf/templates.xml
View File

@ -36,6 +36,9 @@
</content-item> </content-item>
<content-item content-type="com.arsdigita.cms.contenttypes.NewsItem"> <content-item content-type="com.arsdigita.cms.contenttypes.NewsItem">
content-items/news-detail.xml content-items/news-detail.xml
</content-item>
<content-item content-type="com.arsdigita.cms.contenttypes.PressRelease">
content-items/pressrelease-detail.xml
</content-item> </content-item>
<content-item content-type="com.arsdigita.cms.contenttypes.SiteProxy"> <content-item content-type="com.arsdigita.cms.contenttypes.SiteProxy">
content-items/siteproxy-detail.xml content-items/siteproxy-detail.xml
@ -55,6 +58,9 @@
<content-item content-type="com.arsdigita.cms.contenttypes.NewsItem"> <content-item content-type="com.arsdigita.cms.contenttypes.NewsItem">
content-items/article-list.xml content-items/article-list.xml
</content-item> </content-item>
<content-item content-type="com.arsdigita.cms.contenttypes.PressRelease">
content-items/pressrelease-list.xml
</content-item>
<content-item content-type="com.arsdigita.cms.contenttypes.MultiPartArticle"> <content-item content-type="com.arsdigita.cms.contenttypes.MultiPartArticle">
content-items/mpa-list.xml content-items/mpa-list.xml
</content-item> </content-item>

24
ccm-core/web/themes/foundry-base/templates/content-items/pressrelease-detail.xml 100644
View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<content-item-layout>
<div class="lead">
<show-property name="summary"/>
</div>
<div class="main">
<main-text/>
</div>
<h2>
<show-text module="pressrelease">contact-info</show-text>
</h2>
<div>
<show-property disable-output-escaping="yes" name="contactInfo"/>
</div>
<div>
<show-text module="pressrelease">reference-code</show-text>:
<show-property name="referenceCode"/>
</div>
</content-item-layout>

9
ccm-core/web/themes/foundry-base/templates/content-items/pressrelease-list.xml 100644
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<content-item-layout>
<a>
<content-item-title/>
</a>
<div class="lead">
<show-property name="summary"/>
</div>
</content-item-layout>

11
ccm-core/web/themes/foundry-base/texts/pressrelease.xml 100644
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8" ?>
<foundry:static-texts xmlns:foundry="http://foundry.libreccm.org">
<text id="contact-info">
<translation lang="de">Kontaktinformationen</translation>
<translation lang="en">Contact info</translation>
</text>
<text id="reference-code">
<translation lang="de">Referenzcode</translation>
<translation lang="en">Reference code</translation>
</text>
</foundry:static-texts>

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

@ -113,23 +113,23 @@
<xsl:call-template name="process-content-item-detail"> <xsl:call-template name="process-content-item-detail">
<xsl:with-param name="contentitem-tree"> <xsl:with-param name="contentitem-tree">
<xsl:choose> <xsl:choose>
<xsl:when test="$data-tree/nav:greetingItem"> <xsl:when test="$data-tree/nav:greetingItem">
<xsl:copy-of select="$data-tree/nav:greetingItem/cms:item/*"/> <xsl:copy-of select="$data-tree/nav:greetingItem/cms:item/*"/>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:copy-of select="$data-tree/cms:contentPanel/cms:item/*"/> <xsl:copy-of select="$data-tree/cms:contentPanel/cms:item/*"/>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:with-param> </xsl:with-param>
<xsl:with-param name="content-section"> <xsl:with-param name="content-section">
<xsl:choose> <xsl:choose>
<xsl:when test="$data-tree/nav:greetingItem"> <xsl:when test="$data-tree/nav:greetingItem">
<xsl:value-of select="$data-tree/nav:greetingItem/cms:pathInfo/cms:sectionPath"/> <xsl:value-of select="$data-tree/nav:greetingItem/cms:pathInfo/cms:sectionPath"/>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:value-of select="$data-tree/cms:contentPanel/cms:pathInfo/cms:sectionPath"/> <xsl:value-of select="$data-tree/cms:contentPanel/cms:pathInfo/cms:sectionPath"/>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:with-param> </xsl:with-param>
</xsl:call-template> </xsl:call-template>
@ -561,17 +561,42 @@
</xsl:choose> </xsl:choose>
</xsl:template> </xsl:template>
<xsl:template match="content-item-layout//show-property"> <xsl:template match="/content-item-layout//show-property">
<xsl:param name="contentitem-tree" tunnel="yes"/> <xsl:param name="contentitem-tree" tunnel="yes"/>
<xsl:variable name="name" select="./@name"/> <xsl:variable name="name" select="./@name"/>
<xsl:choose> <xsl:choose>
<xsl:when test="$contentitem-tree/*[name() = $name]"> <xsl:when test="$contentitem-tree/*[name() = $name]">
<xsl:value-of select="$contentitem-tree/*[name() = $name]"/> <xsl:choose>
<xsl:when test="foundry:boolean(./@disable-output-escaping)">
<xsl:value-of disable-output-escaping="yes"
select="$contentitem-tree/*[name() = $name]"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="$contentitem-tree/*[name() = $name]"/>
</xsl:otherwise>
</xsl:choose>
</xsl:when> </xsl:when>
<xsl:when test="$contentitem-tree/nav:attribute[@name = $name]"> <xsl:when test="$contentitem-tree/nav:attribute[@name = $name]">
<xsl:value-of select="$contentitem-tree/nav:attribute[@name = $name]"/> <xsl:choose>
<xsl:when test="foundry:boolean(./@disable-output-escaping)">
<xsl:value-of disable-output-escaping="yes"
select="$contentitem-tree/nav:attribute[@name = $name]"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="$contentitem-tree/nav:attribute[@name = $name]"/>
</xsl:otherwise>
</xsl:choose>
</xsl:when> </xsl:when>
<xsl:otherwise>
<xsl:if test="foundry:debug-enabled()">
<code>
<xsl:value-of select="concat('No property ', $name, ' found')"/>
</code>
</xsl:if>
</xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:template> </xsl:template>