From 458951c273c7ad1152c989b7e0c7793f4cee2120 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Sun, 30 Mar 2014 08:35:40 +0000
Subject: [PATCH] Some improvments for the Mandalay theming engine from the
 various installations

git-svn-id: https://svn.libreccm.org/ccm/trunk@2590 8810af33-2d31-482b-a856-94f89814c4df
---
 .../includes/mandalay/layoutParser.xsl        |  8 +++---
 .../web/themes/mandalay/lang/de/global.xml    |  7 +++++
 .../web/themes/mandalay/lang/de/theme.xml     |  2 +-
 .../lang/en/GenericOrganizationalUnit.xml     |  5 ++++
 .../themes/mandalay/lang/en/SciDepartment.xml |  6 +++++
 .../mandalay/lang/en/filterControls.xml       |  3 ++-
 .../web/themes/mandalay/lang/en/global.xml    |  4 +++
 .../web/themes/mandalay/settings/NewsItem.xml |  1 +
 .../settings/PublicPersonalProfile.xml        |  1 +
 .../themes/mandalay/settings/SciMember.xml    |  2 +-
 .../mandalay/settings/SciPublications.xml     |  1 +
 .../mandalay/user/includes/mandalay.xsl       |  1 +
 .../user/includes/mandalay/dynamicImage.xsl   | 19 ++++++++++----
 .../user/includes/mandalay/layoutParser.xsl   | 26 +++++++++++++++++++
 .../mandalay/user/includes/piwik/piwik.xsl    |  6 ++---
 doc/PDLEntities.puml                          | 18 +++++++++++++
 16 files changed, 95 insertions(+), 15 deletions(-)

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 b5c09e274..8177db441 100755
--- a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl
@@ -391,13 +391,13 @@
         <!--<xsl:call-template name="mandalay:lastModified"/>-->
         <xsl:choose>
             <!-- Detail view of a content item -->
-            <xsl:when test="$resultTree/bebop:page/cms:item/masterVersion/auditing">
-                <xsl:apply-templates select="$resultTree/bebop:page/cms:item/masterVersion/auditing" 
+            <xsl:when test="$resultTree/cms:contentPanel/cms:item/masterVersion/auditing">
+                <xsl:apply-templates select="$resultTree/cms:contentPanel/cms:item/masterVersion/auditing" 
                                      mode="auditing"/>
             </xsl:when>
             <!-- Greeting Item -->
-            <xsl:when test="$resultTree/bebop:page/nav:greetingItem/masterVersion/auditing">
-                <xsl:apply-templates select="$resultTree/bebop:page/nav:greetingItem/masterVersion/auditing" 
+            <xsl:when test="$resultTree/nav:greetingItem/masterVersion/auditing">
+                <xsl:apply-templates select="$resultTree/nav:greetingItem/masterVersion/auditing" 
                                      mode="auditing"/>
                         
             </xsl:when>
diff --git a/ccm-sci-bundle/web/themes/mandalay/lang/de/global.xml b/ccm-sci-bundle/web/themes/mandalay/lang/de/global.xml
index dca6ff884..11cec61b1 100755
--- a/ccm-sci-bundle/web/themes/mandalay/lang/de/global.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/lang/de/global.xml
@@ -44,4 +44,11 @@
   <line id="layout/page/title/search">Suche</line>
   <line id="layout/page/title/login">Login</line>
   <line id="layout/page/title/sitemap">Sitemap</line>
+  
+  <line id="headerImage/minimize">Bild verbergen</line>
+  <line id="headerImage/maximize">Bild anzeigen</line>
+
+  <line id="scicms/version">v2.2.0</line>
+  <line id="menu/title/scicms">Zur Homepage von ScientificCMS</line>
+  <line id="menu/name/scicms">ScientificCMS </line>
 </translations>
diff --git a/ccm-sci-bundle/web/themes/mandalay/lang/de/theme.xml b/ccm-sci-bundle/web/themes/mandalay/lang/de/theme.xml
index 2aec5a4f3..7bcc0da96 100644
--- a/ccm-sci-bundle/web/themes/mandalay/lang/de/theme.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/lang/de/theme.xml
@@ -33,7 +33,7 @@
   
   <line id="errorInfo/warning">Warnungen</line>
   <line id="errorInfo/error">Fehler</line>
-  <line id="errorInfo/fatal">Schwere Fehler</line>
+  <line id="errorInfo/fatal">Schwerer Fehler</line>
   <line id="errorInfo/location">Datei: </line>
   <line id="errorInfo/line">Zeile: </line>
   <line id="errorInfo/column">Position: </line>
diff --git a/ccm-sci-bundle/web/themes/mandalay/lang/en/GenericOrganizationalUnit.xml b/ccm-sci-bundle/web/themes/mandalay/lang/en/GenericOrganizationalUnit.xml
index 47a9e1508..7c794b7ba 100644
--- a/ccm-sci-bundle/web/themes/mandalay/lang/en/GenericOrganizationalUnit.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/lang/en/GenericOrganizationalUnit.xml
@@ -29,4 +29,9 @@
   <line id="children">Departments</line>
   <line id="persons">Members</line>
 
+  <line id="textTab/concept">Concept</line>
+  <line id="textTab/research">Research</line>
+  <line id="textTab/teaching">Teaching</line>
+  <line id="textTab/profile">Profile</line>
+
 </translations>
diff --git a/ccm-sci-bundle/web/themes/mandalay/lang/en/SciDepartment.xml b/ccm-sci-bundle/web/themes/mandalay/lang/en/SciDepartment.xml
index 7970ac262..46f2fe141 100644
--- a/ccm-sci-bundle/web/themes/mandalay/lang/en/SciDepartment.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/lang/en/SciDepartment.xml
@@ -31,9 +31,15 @@
   <line id="tabs/members">Members</line>
   <line id="tabs/projects">Projects</line>
   <line id="tabs/publications">Publications</line>
+  <line id="tabs/concept">Concept</line>
+  <line id="tabs/research">Research</line>
+  <line id="tabs/teaching">Teaching</line>
+  <line id="tabs/profile">Profile</line>
 
   <line id="summaryTab/heading">Overview</line>
   <line id="summaryTab/headsHeading">Head of department</line>
+    <line id="summaryTab/viceHeadsHeading">Vice head of department</line>
+    <line id="summaryTab/secretariatHeading">Office</line>
   <line id="summaryTab/subDepartmentsHeading">Work areas</line>
   <line id="summaryTab/contactsHeading">Contact</line>
     
diff --git a/ccm-sci-bundle/web/themes/mandalay/lang/en/filterControls.xml b/ccm-sci-bundle/web/themes/mandalay/lang/en/filterControls.xml
index 92c57c5fe..558cdf2fc 100644
--- a/ccm-sci-bundle/web/themes/mandalay/lang/en/filterControls.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/lang/en/filterControls.xml
@@ -42,6 +42,7 @@
   <line id="SciPublicationsListSortByyearAsc">Year (ascending)</line>
   <line id="SciPublicationsListSortByyearDesc">Year (descending)</line>
   <line id="SciPublicationsListSortByauthors">Authors</line>
+  <line id="SciPublicationsListkeywords">Keywords</line>
 
   <line id="SciProjectListsortAndFilterList">Filter and sort projects</line>
   <line id="SciProjectListfilterList">Filter projects</line>
@@ -54,4 +55,4 @@
   <line id="SciProjectListprojectstatusfinished">Finished projects</line>
   <line id="SciProjectListprojectstatusAll">All projects</line>
   <line id="SciProjectListSortBytitle">Title</line>
-</translations>
\ No newline at end of file
+</translations>
diff --git a/ccm-sci-bundle/web/themes/mandalay/lang/en/global.xml b/ccm-sci-bundle/web/themes/mandalay/lang/en/global.xml
index d1e7ab52e..41c00a166 100755
--- a/ccm-sci-bundle/web/themes/mandalay/lang/en/global.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/lang/en/global.xml
@@ -46,4 +46,8 @@
   <line id="layout/page/title/search">Search</line>
   <line id="layout/page/title/login">Login</line>
   <line id="layout/page/title/sitemap">Sitemap</line>
+
+  <line id="scicms/version">v2.2.0</line>
+  <line id="menu/title/scicms">Go to homepage of ScientificCMS</line>
+  <line id="menu/name/scicms">ScientificCMS </line>
 </translations>
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/NewsItem.xml b/ccm-sci-bundle/web/themes/mandalay/settings/NewsItem.xml
index 003ace267..0aebff534 100755
--- a/ccm-sci-bundle/web/themes/mandalay/settings/NewsItem.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/NewsItem.xml
@@ -35,6 +35,7 @@
   <setting id="listView/setLeadText">true</setting>
   <setting id="listView/setLeadTextLength">440</setting>
   <setting id="listView/setMoreButton">true</setting>
+  <setting id="listView/setImage">false</setting>
 
   <setting id="linkView/setLinkToDetails">true</setting>
   <setting id="linkView/setImageAndText">true</setting>
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/PublicPersonalProfile.xml b/ccm-sci-bundle/web/themes/mandalay/settings/PublicPersonalProfile.xml
index 9b97c4658..f952fbee7 100644
--- a/ccm-sci-bundle/web/themes/mandalay/settings/PublicPersonalProfile.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/PublicPersonalProfile.xml
@@ -29,6 +29,7 @@
   <setting id="setOwnerImageMaxWidth">200</setting>
   <setting id="setOwnerImageMaxHeight">200</setting>
   <setting id="setOwnerImageZoomLinks">false</setting>
+  <setting id="showOwnerName">false</setting>
   <setting id="showProfileImage">true</setting>
   <setting id="showProfileMaxWidth">200</setting>
   <setting id="showProfileMaxHeight">200</setting>
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/SciMember.xml b/ccm-sci-bundle/web/themes/mandalay/settings/SciMember.xml
index fa56ff4b7..965abd86b 100644
--- a/ccm-sci-bundle/web/themes/mandalay/settings/SciMember.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/SciMember.xml
@@ -28,4 +28,4 @@
 
   <setting id="contactentry/homepage/show">false</setting>
   <setting id="contactentry/visitingHours/show">false</setting>
-</settings>
\ No newline at end of file
+</settings>
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/SciPublications.xml b/ccm-sci-bundle/web/themes/mandalay/settings/SciPublications.xml
index e153d75d8..a04b6a3b6 100644
--- a/ccm-sci-bundle/web/themes/mandalay/settings/SciPublications.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/SciPublications.xml
@@ -117,6 +117,7 @@
     <setting id="collectedVolume/setVolume">true</setting>
     <setting id="collectedVolume/setYear">true</setting>
     <setting id="collectedVolume/setYearFirstPublished">true</setting>
+  <setting id="collectedVolume/setArticles">true</setting>
 
     <!-- Settings for the  detail view of an expertise -->
     <setting id="expertise/setImage">true</setting>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/mandalay.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/mandalay.xsl
index 3d9c1cacc..add102c0c 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/mandalay.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/mandalay.xsl
@@ -44,6 +44,7 @@
   <xsl:import href="mandalay/editLinks.xsl"/>
   <xsl:import href="mandalay/homepageTitle.xsl"/>
   <xsl:import href="mandalay/layoutParser.xsl"/>
+  <xsl:import href="mandalay/minimizeHeader.xsl"/>
   <xsl:import href="mandalay/socialMedia.xsl"/>
   
 </xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/mandalay/dynamicImage.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/mandalay/dynamicImage.xsl
index e50b8e18a..e41bee6b5 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/mandalay/dynamicImage.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/mandalay/dynamicImage.xsl
@@ -61,7 +61,7 @@
       </xsl:call-template>
     </xsl:variable>
 
-    <img>
+    <img class="maximized">
       <xsl:if test="$src != ''">
         <xsl:attribute name="src">
           <xsl:call-template name="mandalay:linkParser">
@@ -86,14 +86,23 @@
         </xsl:attribute>
       </xsl:if>
     </img>
+    
+    <xsl:if test="./@minimized">
+        <img class="minimized" style="display:none">
+            <xsl:attribute name="src">
+                <xsl:call-template name="mandalay:linkParser">
+                    <xsl:with-param name="link" select="./@minimized"/>
+                    <xsl:with-param name="prefix" select="$theme-prefix"/>
+                </xsl:call-template>
+            </xsl:attribute>
+        </img>
+    </xsl:if>
+    
   </xsl:template>
   
   <xsl:template name="mandalay:dynamicImagePath">
     <xsl:param name="position" select="count($resultTree//nav:categoryPath/nav:category)"/>
-<!--
     <xsl:variable name="path" select="substring-after($resultTree//nav:categoryPath/nav:category[position() = $position]/@url, 'ccm/')"/>
--->
-    <xsl:variable name="path" select="substring-after($resultTree/@url, 'ccm/')"/>
 
     <xsl:variable name="foundSetting">
       <xsl:call-template name="mandalay:getSetting">
@@ -114,7 +123,7 @@
         </xsl:when>
 
         <xsl:when test="$position = 0">
-          <xsl:value-of select="'default/'"/>
+          <xsl:value-of select="'default'"/>
         </xsl:when>
 
         <xsl:otherwise>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/mandalay/layoutParser.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/mandalay/layoutParser.xsl
index 98112fb50..a605f202a 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/mandalay/layoutParser.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/mandalay/layoutParser.xsl
@@ -139,6 +139,32 @@
         <xsl:call-template name="mandalay:socialMedia"/>
     </xsl:template>
 
+    <xsl:template match="script">
+        <script type="text/javascript">
+            <xsl:attribute name="src">
+                <xsl:choose>
+                    <xsl:when test="./@absolute = 'true'">
+                        <!-- Path is absolute, use path with no modifications -->
+                        <xsl:value-of select="." />
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <!-- Path is relative to theme, add theme-prefix to create absolute path -->
+                        <xsl:value-of select="concat($theme-prefix, .)"/>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:attribute>
+        </script>
+    </xsl:template>
+  
+    <xsl:template match="showMinimizeImageLink">
+        <xsl:call-template name="mandalay:minimizeHeader">
+            <xsl:with-param name="imageClass" select="./imageClass"/>
+            <xsl:with-param name="linkClass" select="./linkClass"/>
+            <xsl:with-param name="minimizeText" select="./minimizeText"/>
+            <xsl:with-param name="maximizeText" select="./maximizeText"/>
+        </xsl:call-template>
+    </xsl:template>
+
     <xsl:template match="useYAML">
         <link rel="stylesheet" type="text/css" href="{$theme-prefix}/yaml/core/base.min.css"/>
         <xsl:text disable-output-escaping="yes">
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/piwik/piwik.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/piwik/piwik.xsl
index 210315171..32ed1433c 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/piwik/piwik.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/piwik/piwik.xsl
@@ -81,8 +81,8 @@ To use the templates definied here follow these steps:
         <xsl:param name="piwikUrl"/>
         <xsl:param name="idSite"/>
         <script type="text/javascript">
-            <xsl:value-of select="concat('var piwikUrl = &quot;', $piwikUrl, '&quot;')" />
-            <xsl:value-of select="concat('var idSite = ', $idSite)" />
+            <xsl:value-of select="concat('var piwikUrl = &quot;', $piwikUrl, '&quot;;')" />
+            <xsl:value-of select="concat('var idSite = ', $idSite, ';')" />
             var _paq = _paq || [];
             _paq.push(["trackPageView"]);
             _paq.push(["enableLinkTracking"]);
@@ -113,4 +113,4 @@ To use the templates definied here follow these steps:
 
     </xsl:template>
 
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/doc/PDLEntities.puml b/doc/PDLEntities.puml
index 1fd30e015..2e2d90a63 100644
--- a/doc/PDLEntities.puml
+++ b/doc/PDLEntities.puml
@@ -622,6 +622,7 @@ namespace com.arsdigita.kernel {
     class UserAuthentication
 
     ACSObject <|-- Party
+    ACSObject <|-- Resource
     Party <|-- Group
     Party <|-- User
 
@@ -846,6 +847,13 @@ namespace com.arsdigita.portal {
     PortletType -- com.arsdigita.web.ApplicationType
 }
 
+namespace com.arsdigita.portal.portlet {
+
+    class WorkspaceDirectoryPortlet <<ccm-rssfeed>>
+
+    com.arsdigita.portal.Portlet <|-- WorkspaceDirectoryPortlet
+}
+
 namespace com.arsdigita.portlet {
 
     class BookmarksPortlet
@@ -918,6 +926,16 @@ namespace com.arsdigita.preferences {
     Preferences -- PerferenceParameter
 }
 
+namespace com.arsdigita.rssfeed {
+
+    class Feed <<ccm-rssfeed>>
+    class RSSFeed <<ccm-rssfeed>>
+
+    com.arsdigita.kernel.ACSObject <|-- Feed
+    com.arsdigita.web.Application <|-- RSSFeed
+
+}
+
 namespace com.arsdigita.runtime {
     
     class Initializer