From c57973f825bf20157af8086db61a45ffee760cc4 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Thu, 30 Oct 2014 16:31:26 +0000
Subject: [PATCH] Syncing Mandalay themes in ccm-sci-bundle and ccm-ldn-aplaws

git-svn-id: https://svn.libreccm.org/ccm/trunk@2931 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-ldn-aplaws/web/themes/mandalay/includes/types/Person.xsl | 5 +++--
 .../mandalay/user/includes/types/SciMember/SciMember.xsl     | 4 ++--
 .../types/SciPublications/ArticleInCollectedVolume.xsl       | 3 +++
 .../user/includes/types/SciPublications/CollectedVolume.xsl  | 4 +++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ccm-ldn-aplaws/web/themes/mandalay/includes/types/Person.xsl b/ccm-ldn-aplaws/web/themes/mandalay/includes/types/Person.xsl
index 9737db5fb..0c4d6a428 100644
--- a/ccm-ldn-aplaws/web/themes/mandalay/includes/types/Person.xsl
+++ b/ccm-ldn-aplaws/web/themes/mandalay/includes/types/Person.xsl
@@ -200,6 +200,7 @@
       </xsl:call-template>
     </xsl:variable>
 
+
     <xsl:if test="$setImage = 'true' and nav:attribute[@name='imageAttachments.image.id']">
       <a>
         <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
@@ -238,7 +239,7 @@
             <xsl:value-of select="./givenname"/>
             <xsl:text> </xsl:text>
           </xsl:if>
-          <xsl:if test="string-length(./givenname) &gt; 0">
+          <xsl:if test="string-length(./surname) &gt; 0">
             <xsl:value-of select="./surname"/>
           </xsl:if>
           <xsl:if test="string-length(./titlePost) &gt; 0">
@@ -257,7 +258,7 @@
             <xsl:value-of select="./givenname"/>
             <xsl:text> </xsl:text>
           </xsl:if>
-          <xsl:if test="string-length(./givenname) &gt; 0">
+          <xsl:if test="string-length(./surname) &gt; 0">
             <xsl:value-of select="./surname"/>
           </xsl:if>
           <xsl:if test="string-length(./titlePost) &gt; 0">
diff --git a/ccm-ldn-aplaws/web/themes/mandalay/user/includes/types/SciMember/SciMember.xsl b/ccm-ldn-aplaws/web/themes/mandalay/user/includes/types/SciMember/SciMember.xsl
index e52732122..aca4a7970 100644
--- a/ccm-ldn-aplaws/web/themes/mandalay/user/includes/types/SciMember/SciMember.xsl
+++ b/ccm-ldn-aplaws/web/themes/mandalay/user/includes/types/SciMember/SciMember.xsl
@@ -263,7 +263,7 @@
                         <xsl:value-of select="./givenname"/>
                         <xsl:text> </xsl:text>
                     </xsl:if>
-                    <xsl:if test="string-length(./givenname) &gt; 0">
+                    <xsl:if test="string-length(./surname) &gt; 0">
                         <xsl:value-of select="./surname"/>
                     </xsl:if>
                     <xsl:if test="string-length(./titlepost) &gt; 0">
@@ -285,7 +285,7 @@
                         <xsl:value-of select="./givenname"/>
                         <xsl:text> </xsl:text>
                     </xsl:if>
-                    <xsl:if test="string-length(./givenname) &gt; 0">
+                    <xsl:if test="string-length(./surname) &gt; 0">
                         <xsl:value-of select="./surname"/>
                     </xsl:if>
                     <xsl:if test="string-length(./titlepost) &gt; 0">
diff --git a/ccm-ldn-aplaws/web/themes/mandalay/user/includes/types/SciPublications/ArticleInCollectedVolume.xsl b/ccm-ldn-aplaws/web/themes/mandalay/user/includes/types/SciPublications/ArticleInCollectedVolume.xsl
index 65ac63753..6970d9dcd 100644
--- a/ccm-ldn-aplaws/web/themes/mandalay/user/includes/types/SciPublications/ArticleInCollectedVolume.xsl
+++ b/ccm-ldn-aplaws/web/themes/mandalay/user/includes/types/SciPublications/ArticleInCollectedVolume.xsl
@@ -496,6 +496,7 @@
                   match="nav:item[nav:attribute[@name='objectType'] = 'com.arsdigita.cms.contenttypes.ArticleInCollectedVolume']"
                   mode="list_view">
         <xsl:param name="useRelativeUrl" select="'false'" />
+        <xsl:param name="omitCollectedVolume" select="'false'"/>
         <!-- EN Get all settings needed -->
         <xsl:variable name="formatDefFile">
             <xsl:call-template name="mandalay:getSetting">
@@ -585,6 +586,7 @@
              Process the collected volume information and store the result in a variable.
         -->
         <xsl:variable name="collectedVolume">
+        	<xsl:if test="$omitCollectedVolume != 'true'">
             <xsl:apply-templates select="document(concat($theme-prefix, '/settings/', $formatDefFile))/bibrefFormat/bibrefCollectedVolumeFormat">
 
                 <xsl:with-param name="authors" select="$collectedVolumeAuthors" />
@@ -599,6 +601,7 @@
                 <xsl:with-param name="oid" select="./collectedVolume/@oid" />
                 <xsl:with-param name="useRelativeUrl" select="$useRelativeUrl" />
             </xsl:apply-templates>
+            </xsl:if>         
         </xsl:variable>
     
         <!-- 
diff --git a/ccm-ldn-aplaws/web/themes/mandalay/user/includes/types/SciPublications/CollectedVolume.xsl b/ccm-ldn-aplaws/web/themes/mandalay/user/includes/types/SciPublications/CollectedVolume.xsl
index 62132c6e2..40d3cc399 100644
--- a/ccm-ldn-aplaws/web/themes/mandalay/user/includes/types/SciPublications/CollectedVolume.xsl
+++ b/ccm-ldn-aplaws/web/themes/mandalay/user/includes/types/SciPublications/CollectedVolume.xsl
@@ -509,7 +509,9 @@
                 <ul class="articlesList">
                     <xsl:for-each select="./articles/article">
                         <li>
-                            <xsl:call-template name="CT_CollectedVolume_List" />
+                            <xsl:call-template name="CT_ArticleInCollectedVolume_List" >
+                            	<xsl:with-param name="omitCollectedVolume" select="'true'"/>
+                            </xsl:call-template>
                         </li>
                     </xsl:for-each>
                 </ul>