From c531b6bbcc0e352c1acab52e0059b24e618627e3 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Fri, 5 Dec 2014 19:43:57 +0000
Subject: [PATCH] - 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
---
 .../themes/foundry-base/conf/templates.xml    |  6 ++
 .../content-items/pressrelease-detail.xml     | 24 ++++++++
 .../content-items/pressrelease-list.xml       |  9 +++
 .../foundry-base/texts/pressrelease.xml       | 11 ++++
 .../lib/template-tags/content-items.xsl       | 59 +++++++++++++------
 5 files changed, 92 insertions(+), 17 deletions(-)
 create mode 100644 ccm-core/web/themes/foundry-base/templates/content-items/pressrelease-detail.xml
 create mode 100644 ccm-core/web/themes/foundry-base/templates/content-items/pressrelease-list.xml
 create mode 100644 ccm-core/web/themes/foundry-base/texts/pressrelease.xml

diff --git a/ccm-core/web/themes/foundry-base/conf/templates.xml b/ccm-core/web/themes/foundry-base/conf/templates.xml
index 7425f4be9..fe90ac9e4 100644
--- a/ccm-core/web/themes/foundry-base/conf/templates.xml
+++ b/ccm-core/web/themes/foundry-base/conf/templates.xml
@@ -36,6 +36,9 @@
             </content-item>
             <content-item content-type="com.arsdigita.cms.contenttypes.NewsItem">
                 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-type="com.arsdigita.cms.contenttypes.SiteProxy">
                 content-items/siteproxy-detail.xml
@@ -55,6 +58,9 @@
             <content-item content-type="com.arsdigita.cms.contenttypes.NewsItem">
                 content-items/article-list.xml
             </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-items/mpa-list.xml
             </content-item>
diff --git a/ccm-core/web/themes/foundry-base/templates/content-items/pressrelease-detail.xml b/ccm-core/web/themes/foundry-base/templates/content-items/pressrelease-detail.xml
new file mode 100644
index 000000000..698cf267c
--- /dev/null
+++ b/ccm-core/web/themes/foundry-base/templates/content-items/pressrelease-detail.xml
@@ -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>
\ No newline at end of file
diff --git a/ccm-core/web/themes/foundry-base/templates/content-items/pressrelease-list.xml b/ccm-core/web/themes/foundry-base/templates/content-items/pressrelease-list.xml
new file mode 100644
index 000000000..8cd250887
--- /dev/null
+++ b/ccm-core/web/themes/foundry-base/templates/content-items/pressrelease-list.xml
@@ -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>
\ No newline at end of file
diff --git a/ccm-core/web/themes/foundry-base/texts/pressrelease.xml b/ccm-core/web/themes/foundry-base/texts/pressrelease.xml
new file mode 100644
index 000000000..9a95e87b3
--- /dev/null
+++ b/ccm-core/web/themes/foundry-base/texts/pressrelease.xml
@@ -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>
\ No newline at end of file
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl
index a8526a07f..273f63cb4 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl
@@ -113,23 +113,23 @@
             <xsl:call-template name="process-content-item-detail">
                 <xsl:with-param name="contentitem-tree">
                     <xsl:choose>
-                    <xsl:when test="$data-tree/nav:greetingItem">
-                        <xsl:copy-of select="$data-tree/nav:greetingItem/cms:item/*"/>
-                    </xsl:when>
-                    <xsl:otherwise>
-                        <xsl:copy-of select="$data-tree/cms:contentPanel/cms:item/*"/>
-                    </xsl:otherwise>
-                </xsl:choose>
+                        <xsl:when test="$data-tree/nav:greetingItem">
+                            <xsl:copy-of select="$data-tree/nav:greetingItem/cms:item/*"/>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:copy-of select="$data-tree/cms:contentPanel/cms:item/*"/>
+                        </xsl:otherwise>
+                    </xsl:choose>
                 </xsl:with-param>
                 <xsl:with-param name="content-section">
                     <xsl:choose>
-                    <xsl:when test="$data-tree/nav:greetingItem">
-                        <xsl:value-of select="$data-tree/nav:greetingItem/cms:pathInfo/cms:sectionPath"/>
-                    </xsl:when>
-                    <xsl:otherwise>
-                        <xsl:value-of select="$data-tree/cms:contentPanel/cms:pathInfo/cms:sectionPath"/>
-                    </xsl:otherwise>
-                </xsl:choose>
+                        <xsl:when test="$data-tree/nav:greetingItem">
+                            <xsl:value-of select="$data-tree/nav:greetingItem/cms:pathInfo/cms:sectionPath"/>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:value-of select="$data-tree/cms:contentPanel/cms:pathInfo/cms:sectionPath"/>
+                        </xsl:otherwise>
+                    </xsl:choose>
                 </xsl:with-param>
             </xsl:call-template>
             
@@ -561,17 +561,42 @@
         </xsl:choose>
     </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:variable name="name" select="./@name"/>
         
         <xsl:choose>
             <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 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: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:template>