From 3f16dde9a1e620d7cef9a6ddaaed6b8b77c67477 Mon Sep 17 00:00:00 2001
From: quasi <quasi@8810af33-2d31-482b-a856-94f89814c4df>
Date: Thu, 10 Oct 2013 08:29:13 +0000
Subject: [PATCH] Neueste Version von Mandalay mit weiteren Verbesserungen im
 ContentCenter

git-svn-id: https://svn.libreccm.org/ccm/trunk@2345 8810af33-2d31-482b-a856-94f89814c4df
---
 .../web/themes/mandalay/includes/cms/cmsGreeting.xsl        | 2 +-
 .../web/themes/mandalay/includes/mandalay/layoutParser.xsl  | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsGreeting.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsGreeting.xsl
index 4e26433bb..aa3b0e118 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsGreeting.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsGreeting.xsl
@@ -55,7 +55,7 @@
             <xsl:value-of select="$resultTree/@name"/>
           </xsl:when>
           <xsl:when test="$resultTree//ui:userBanner/@screenName">
-            <xsl:value-of select="concat($resultTree//ui:userBanner/@givenName, '', $resultTree//ui:userBanner/@familyName)"/>
+            <xsl:value-of select="concat($resultTree//ui:userBanner/@givenName, ' ', $resultTree//ui:userBanner/@familyName)"/>
           </xsl:when>
         </xsl:choose>
       </span>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl
index cec72f7cf..258ec615b 100755
--- a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl
@@ -365,7 +365,11 @@
                                  $resultTree//bebop:currentPane/cms:linkSummary | 
                                  $resultTree//bebop:currentPane/cms:lifecycleSummary | 
                                  $resultTree//bebop:currentPane/cms:workflowSummary | 
-                                 $resultTree//bebop:currentPane/cms:transactionSummary"/>
+                                 $resultTree//bebop:currentPane/cms:transactionSummary |
+                                 $resultTree//bebop:currentPane/bebop:boxPanel |
+                                 $resultTree//bebop:currentPane//bebop:form[@name='imageLibraryComponent'] |
+                                 $resultTree//bebop:currentPane//bebop:form[@name='imageUploadComponent']
+                                 "/>
   </xsl:template>
 
   <xsl:template match="useContent">