From 07dcf33272a4627243bdc9cfc27c5ec3d1d2a461 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Tue, 19 May 2015 09:37:13 +0000
Subject: [PATCH] Fixed notes display in Content Centre

git-svn-id: https://svn.libreccm.org/ccm/trunk@3418 8810af33-2d31-482b-a856-94f89814c4df
---
 .../web/themes/foundry/foundry/lib/cms.xsl    |  1 +
 .../themes/foundry/foundry/lib/cms/notes.xsl  | 95 +++++++++++++++++++
 ccm-sci-bundle/bundles/devel/cfg/project.xml  |  2 +-
 3 files changed, 97 insertions(+), 1 deletion(-)
 create mode 100644 ccm-core/web/themes/foundry/foundry/lib/cms/notes.xsl

diff --git a/ccm-core/web/themes/foundry/foundry/lib/cms.xsl b/ccm-core/web/themes/foundry/foundry/lib/cms.xsl
index cac56fd3a..1a6eac7dc 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/cms.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/cms.xsl
@@ -24,6 +24,7 @@
                 version="2.0">
     
     <xsl:import href="cms/item-summary.xsl"/>
+    <xsl:import href="cms/notes.xsl"/>
     <xsl:import href="cms/tasks-panel.xsl"/>
     
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-core/web/themes/foundry/foundry/lib/cms/notes.xsl b/ccm-core/web/themes/foundry/foundry/lib/cms/notes.xsl
new file mode 100644
index 000000000..294f3c404
--- /dev/null
+++ b/ccm-core/web/themes/foundry/foundry/lib/cms/notes.xsl
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE stylesheet [<!ENTITY nbsp '&#160;'>]>
+
+<!-- 
+    Copyright: 2006, 2007, 2008, 2009 Sören Bernstein
+  
+    This file is part of Mandalay.
+
+    Mandalay 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.
+
+    Mandalay 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 Mandalay.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<!-- DE
+  Hier werden die  verarbeitet 
+-->
+
+<!-- EN
+  Processing 
+-->
+
+<!-- Autor: Sören Bernstein -->
+
+<xsl:stylesheet 
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    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:mandalay="http://mandalay.quasiweb.de"
+    exclude-result-prefixes="xsl bebop cms nav mandalay" 
+    version="1.0">
+  
+    <xsl:template match="cms:notesDisplay">
+        <xsl:apply-templates select="object"/>
+    </xsl:template>
+  
+    <xsl:template match="object">
+        <div class="cmsNotesDisplay">
+            <div class="cmsNotesAction">
+                <xsl:variable name="oid" select="@oid"/>
+                <xsl:choose>
+                    <!-- DE Kein Hoch-Link beim ersten Eintrag -->
+                    <!-- EN No up link for the first entry -->
+                    <xsl:when test="rank = '0'">
+                        <xsl:apply-templates select="../cms:notesAction[@oid=$oid and @action!='up']"/>
+                    </xsl:when>
+                    <!-- DE Kein Runter-Link beim letzten Eintrag -->
+                    <!-- EN No down link for the last entry -->
+                    <xsl:when test="position() = count(../object)">
+                        <xsl:apply-templates select="../cms:notesAction[@oid=$oid and @action!='down']"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:apply-templates select="../cms:notesAction[@oid=$oid]"/>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </div>
+            <div class="cmsNotesContent">
+                <xsl:value-of select="content" disable-output-escaping="yes"/>
+            </div>
+            <div class="endFloat"/>
+        </div>
+    </xsl:template>
+  
+    <xsl:template match="cms:notesAction">
+        <span>
+            <xsl:choose>
+                <xsl:when test="@action">
+                    <xsl:attribute name="class">
+                        <xsl:value-of select="concat('action ',@action)"/>
+                    </xsl:attribute>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:attribute name="class">
+                        <xsl:value-of select="'action'"/>
+                    </xsl:attribute>
+                </xsl:otherwise>
+            </xsl:choose>
+
+            <a href="{foundry:parse-link(./@href)}">
+                <xsl:value-of select="@action"/>
+            </a>
+        </span>
+    </xsl:template>
+    
+</xsl:stylesheet>
diff --git a/ccm-sci-bundle/bundles/devel/cfg/project.xml b/ccm-sci-bundle/bundles/devel/cfg/project.xml
index 1717597ee..5fb48ff15 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/project.xml
+++ b/ccm-sci-bundle/bundles/devel/cfg/project.xml
@@ -9,7 +9,7 @@
                     name="ScientificCMS" 
               prettyName="Scientific CMS" 
                  version="2.3.0" 
-                 release="devel-SNAPSHOT-r3010" 
+                 release="devel-SNAPSHOT-r3317" 
                   webxml="sci-web.xml" 
               portletxml="sci-portlet.xml" 
                   webapp="libreccm"