From 9b3eb396bc7ef60a3517400de6b8665e2c3a8cbe Mon Sep 17 00:00:00 2001
From: quasi <quasi@8810af33-2d31-482b-a856-94f89814c4df>
Date: Thu, 2 Aug 2012 05:36:41 +0000
Subject: [PATCH] Neue Variante von Mandalay integriert
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bietet nun Unterstützung für:
 * ImageLibrary als Thumbnails
 * ImageGallery
 * Script (z.B. für OpenCCM Plugin für Xinha)
 * Weiterer Zitierstil
 * MathJax

git-svn-id: https://svn.libreccm.org/ccm/trunk@1799 8810af33-2d31-482b-a856-94f89814c4df
---
 .../mandalay/css/screen/global/admin.css      |  31 +++-
 .../mandalay/css/screen/global/basic.css      |   3 +
 .../web/themes/mandalay/includes/mandalay.xsl |   1 +
 .../includes/mandalay/fileAttachments.xsl     |  62 ++++++--
 .../includes/mandalay/imageAttachment.xsl     |   2 +-
 .../mandalay/includes/mandalay/script.xsl     |  48 +++++++
 .../mandalay/includes/types/Contact.xsl       |   6 +-
 .../includes/types/FileStorageItem.xsl        |  71 ++++++---
 .../themes/mandalay/lang/de/SciInstitute.xml  |   6 +-
 .../themes/mandalay/lang/en/SciInstitute.xml  |   6 +-
 .../mandalay/layout/PublicPersonalProfile.xml |   2 +
 .../themes/mandalay/layout/content-center.xml |  17 +--
 .../themes/mandalay/layout/defaultLayout.xml  |   2 +
 .../web/themes/mandalay/layout/forum.xml      |   2 +
 .../web/themes/mandalay/layout/login.xml      |   2 +
 .../web/themes/mandalay/layout/navigation.xml |   2 +
 .../web/themes/mandalay/layout/portal.xml     |   2 +
 .../web/themes/mandalay/layout/search.xml     |   2 +
 .../web/themes/mandalay/layout/sitemap.xml    |   2 +
 .../settings/SciPublicationsHarvardFormat.xml | 133 +++++++++++++++++
 .../web/themes/mandalay/settings/global.xml   |   2 +
 .../themes/mandalay/settings/imageGallery.xml |   1 +
 .../mandalay/user/includes/mandalay.xsl       |   2 +-
 .../{headerImage.xsl => dynamicImage.xsl}     |  18 +--
 .../user/includes/mandalay/layoutParser.xsl   |   6 +-
 .../SciInstitute/SciInstituteSummaryTab.xsl   | 136 +++++++++---------
 .../includes/types/SciMember/SciMember.xsl    |  17 ++-
 .../includes/types/SciProject/SciProject.xsl  | 136 ++++++++++++++++++
 .../types/SciPublications/formatParser.xsl    |   4 +-
 .../user/includes/types/siteProxy/dabin.xsl   |  19 +++
 30 files changed, 606 insertions(+), 137 deletions(-)
 create mode 100644 ccm-sci-bundle/web/themes/mandalay/includes/mandalay/script.xsl
 create mode 100644 ccm-sci-bundle/web/themes/mandalay/settings/SciPublicationsHarvardFormat.xml
 rename ccm-sci-bundle/web/themes/mandalay/user/includes/mandalay/{headerImage.xsl => dynamicImage.xsl} (88%)

diff --git a/ccm-sci-bundle/web/themes/mandalay/css/screen/global/admin.css b/ccm-sci-bundle/web/themes/mandalay/css/screen/global/admin.css
index 466470213..190dc376f 100644
--- a/ccm-sci-bundle/web/themes/mandalay/css/screen/global/admin.css
+++ b/ccm-sci-bundle/web/themes/mandalay/css/screen/global/admin.css
@@ -212,6 +212,12 @@ div#cmsHeader a:hover {
   color: #a75b3b;
 }
 
+div#cmsHeader .logo {
+  min-height: 50px;
+  border: 1px solid #aea691;
+}
+
+
 div#cmsHeader div { 
   position:relative;
   float: left;
@@ -266,7 +272,7 @@ div.cmsGlobalNavigation > span {
 div#cmsHeader div.cmsGlobalNavigation { 
   position: absolute;
   right: 0em;
-  top:3em;
+top:4em;
   margin-right: 1em;
 }
 
@@ -352,12 +358,14 @@ width:95%;
 
  div.bebopPanelRow { 
   margin-bottom:1em;
+width:40%;
 }
 div.bebopPanelRow table tr td { 
   margin-bottom:1em;
 /*width:10%;*/
 }
 
+
 div.bebopPanelRow textarea{
 width:100%;
 background-color:#ffffff;
@@ -581,4 +589,25 @@ border:1px solid #613d6b;
 color:#613d6b;
 }
 
+/* ImageBrowser */
+.tile {
+  float: left;
+  width: 220px;
+  min-height: 220px;
+  margin: 0.3em;
+  border: 1px dotted gray;
+  overflow: hidden;
+}
 
+.tile img {
+  margin: 0.5em;
+}
+
+.tile div {
+  text-align: center;
+  height: 170px;
+}
+
+.tile div + div {
+  height: auto;
+}
diff --git a/ccm-sci-bundle/web/themes/mandalay/css/screen/global/basic.css b/ccm-sci-bundle/web/themes/mandalay/css/screen/global/basic.css
index 460915e88..fcaf4ad54 100755
--- a/ccm-sci-bundle/web/themes/mandalay/css/screen/global/basic.css
+++ b/ccm-sci-bundle/web/themes/mandalay/css/screen/global/basic.css
@@ -1022,6 +1022,9 @@ div.image span.caption {
   font-size: 0.85em;
 }
 
+.image + .image {
+  display: none;
+}
 
 /*-------CT NewsItem--------*/
 
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay.xsl
index b2c365fce..582c56af3 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay.xsl
@@ -59,6 +59,7 @@
   <xsl:import href="mandalay/quicksearch.xsl"/>
   <xsl:import href="mandalay/relatedItems.xsl"/>
   <xsl:import href="mandalay/relatedLinks.xsl"/>
+  <xsl:import href="mandalay/script.xsl"/>
   <xsl:import href="mandalay/staticImage.xsl"/>
   <xsl:import href="mandalay/staticLink.xsl"/>
   <xsl:import href="mandalay/staticMenu.xsl"/>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/fileAttachments.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/fileAttachments.xsl
index 1fb0457ec..7b2e7cdbe 100755
--- a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/fileAttachments.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/fileAttachments.xsl
@@ -70,6 +70,14 @@
           <xsl:with-param name="default" select="'true'"/>
         </xsl:call-template>
       </xsl:variable>
+      <xsl:variable name="includeFileNameIntoFileLinks">
+	<xsl:call-template name="mandalay:getSetting">
+	  <xsl:with-param name="module"  select="'global'"/>
+        <xsl:with-param name="setting" select="'includeFileNameIntoFileLinks'"/>
+	<xsl:with-param name="default" select="'false'"/>	
+	</xsl:call-template>
+      </xsl:variable>
+
 
       <div class="fileAttachments">
         <xsl:if test="$setHeading='true'">
@@ -84,7 +92,20 @@
           <xsl:for-each select="$resultTree//cms:item/fileAttachments">
             <xsl:sort data-type="number" select="fileOrder"/>
             <li>
-              <a href="{$dispatcher-prefix}/cms-service/stream/asset/?asset_id={./id}">
+	      <a>
+		<xsl:choose>
+		  <xsl:when test="$includeFileNameIntoFileLinks = 'true'">
+		  <xsl:attribute name="href">
+		    <xsl:value-of select="$dispatcher-prefix"/>/cms-service/stream/asset/<xsl:value-of select="./name"/>?asset_id=<xsl:value-of select="./id"/>
+		  </xsl:attribute>
+		  </xsl:when>
+		  <xsl:otherwise>
+		    <xsl:attribute name="href">
+		      <xsl:value-of select="$dispatcher-prefix"/>/cms-service/stream/asset/?asset_id=<xsl:value-of select="./id"/>
+		    </xsl:attribute>
+		  </xsl:otherwise>
+		</xsl:choose>
+		<!-- <a href="{$dispatcher-prefix}/cms-service/stream/asset/{./name}/?asset_id={./id}"> -->
                 <xsl:attribute name="title"><xsl:value-of select="name"/></xsl:attribute>
                 <xsl:value-of select="name"/>
               </a>
@@ -94,19 +115,32 @@
               </xsl:if>
               <xsl:if test="$setDownload='true'">
                 <br />
-                <a href="{$dispatcher-prefix}/cms-service/download/asset/?asset_id={./id}">
-                  <xsl:attribute name="title">
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'fileAttachments'"/>
-                      <xsl:with-param name="id" select="'download/title'" />
-                    </xsl:call-template>
-                  </xsl:attribute>
-                  <xsl:call-template name="mandalay:getStaticText">
-                    <xsl:with-param name="module" select="'fileAttachments'"/>
-                    <xsl:with-param name="id" select="'download/link'" />
-                  </xsl:call-template>
-                </a>
-              </xsl:if>
+		<a>
+		  <xsl:choose>
+		    <xsl:when test="$includeFileNameIntoFileLinks = 'true'">
+		      <xsl:attribute name="href">
+			<xsl:value-of select="$dispatcher-prefix"/>/cms-service/download/asset/<xsl:value-of select="./name"/>?asset_id=<xsl:value-of select="./id"/>
+		      </xsl:attribute>
+		    </xsl:when>
+		    <xsl:otherwise>
+		      <xsl:attribute name="href">
+			<xsl:value-of select="$dispatcher-prefix"/>/cms-service/download/asset/?asset_id=<xsl:value-of select="./id"/>
+		      </xsl:attribute>
+		    </xsl:otherwise>
+		  </xsl:choose>
+		  <!--<a href="{$dispatcher-prefix}/cms-service/download/asset/{./name}/?asset_id={./id}">-->
+		  <xsl:attribute name="title">
+		  <xsl:call-template name="mandalay:getStaticText">
+		    <xsl:with-param name="module" select="'fileAttachments'"/>
+		    <xsl:with-param name="id" select="'download/title'" />
+		  </xsl:call-template>
+		  </xsl:attribute>
+		  <xsl:call-template name="mandalay:getStaticText">
+		    <xsl:with-param name="module" select="'fileAttachments'"/>
+		  <xsl:with-param name="id" select="'download/link'" />
+		  </xsl:call-template>
+		</a>
+	      </xsl:if>
             </li>
           </xsl:for-each>
         </ul>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/imageAttachment.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/imageAttachment.xsl
index 3d7e8a32a..a65e7dd72 100755
--- a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/imageAttachment.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/imageAttachment.xsl
@@ -180,7 +180,7 @@ Parameter showCaption: boolean to sshow caption
             <xsl:when test="$setZoomLink = 'true' and (width != $width or height != $height)">
               <a>
                 <xsl:attribute name="href">
-                  <xsl:value-of select="$dispatcher-prefix"/>/cms-service/stream/image/?image_id=<xsl:value-of select="id"/>
+                  <xsl:value-of select="$dispatcher-prefix"/>/cms-service/stream/image/<xsl:value-of select="name"/>/?image_id=<xsl:value-of select="id"/>
                 </xsl:attribute>
                 <xsl:choose>
                   <xsl:when test="not(../caption) or $showCaption='false'">
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/script.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/script.xsl
new file mode 100644
index 000000000..f4a05ea20
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/script.xsl
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE stylesheet [<!ENTITY nbsp '&#160;'>]>
+
+<!-- 
+    Copyright: 2006, 2007, 2008 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 wird ein Script eingefügt
+-->
+
+<!-- EN
+  Inserts a script
+-->
+
+<!-- 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: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="scipt">
+    <script type="{@type}">
+      <xsl:value-of select="."/>
+    </script>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/types/Contact.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/types/Contact.xsl
index 818b31a63..084da619d 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/types/Contact.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/types/Contact.xsl
@@ -462,7 +462,11 @@
         </xsl:call-template>    
       </h3>
     </xsl:if>
-    <xsl:apply-templates select="contactentries"/>
+    <xsl:for-each select="./contactEntryKeys/entryKey">
+      <xsl:apply-templates select="../../contactentries[keyId=current()]">
+	<xsl:with-param name="key" select="entryKey"/>
+      </xsl:apply-templates>
+    </xsl:for-each>      
   </xsl:if>
 </xsl:template>
 
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/types/FileStorageItem.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/types/FileStorageItem.xsl
index 42d86aede..002afa677 100755
--- a/ccm-sci-bundle/web/themes/mandalay/includes/types/FileStorageItem.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/types/FileStorageItem.xsl
@@ -84,6 +84,13 @@
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="includeFileNameIntoFileLinks">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'global'"/>
+        <xsl:with-param name="setting" select="'includeFileNameIntoFileLinks'"/>
+        <xsl:with-param name="default" select="'false'"/>	
+      </xsl:call-template>
+    </xsl:variable>
     
     <div id="greeting">
       <xsl:if test="$setImage = 'true'">
@@ -102,33 +109,55 @@
     </div>
     <div id="fsiAction">
       <xsl:if test="$setViewLink = 'true'">
-        <a href="{$dispatcher-prefix}/cms-service/stream/asset/?asset_id={./file/id}">
-          <xsl:attribute name="title">
-            <xsl:call-template name="mandalay:getStaticText">
-              <xsl:with-param name="module" select="'FileStorageItem'"/>
-              <xsl:with-param name="id" select="'view/title'" />
-            </xsl:call-template>
-          </xsl:attribute>
-          <xsl:call-template name="mandalay:getStaticText">
-            <xsl:with-param name="module" select="'FileStorageItem'"/>
-            <xsl:with-param name="id" select="'view/link'" />
-          </xsl:call-template>
-        </a>
+	<a>
+	  <xsl:attribute name="href">	  
+	    <xsl:choose>
+	      <xsl:when test="$includeFileNameIntoFileLinks = 'true'">		
+		<xsl:value-of select="$dispatcher-prefix"/>/cms-service/stream/asset/<xsl:value-of select="./file/name"/>?asset_id=<xsl:value-of select="./file/id"/>
+	      </xsl:when>
+	      <xsl:otherwise>
+		<xsl:value-of select="$dispatcher-prefix"/>/cms-service/stream/asset/?asset_id=<xsl:value-of select="./file/id"/>
+	      </xsl:otherwise>
+	    </xsl:choose>
+	  </xsl:attribute>
+	  <!--	    <a href="{$dispatcher-prefix}/cms-service/stream/asset/{./file/name}/?asset_id={./file/id}">-->
+	  <xsl:attribute name="title">
+	    <xsl:call-template name="mandalay:getStaticText">
+	      <xsl:with-param name="module" select="'FileStorageItem'"/>
+	      <xsl:with-param name="id" select="'view/title'" />
+	    </xsl:call-template>
+	  </xsl:attribute>
+	  <xsl:call-template name="mandalay:getStaticText">
+	    <xsl:with-param name="module" select="'FileStorageItem'"/>
+	    <xsl:with-param name="id" select="'view/link'" />
+	  </xsl:call-template>
+	</a>
       </xsl:if>
       <xsl:if test="$setViewLink = 'true' and $setSaveLink = 'true'">
         <xsl:value-of select="$separator"/>
       </xsl:if>
       <xsl:if test="$setSaveLink = 'true'">
-        <a href="{$dispatcher-prefix}/cms-service/download/asset/?asset_id={./file/id}">
-          <xsl:attribute name="title">
-            <xsl:call-template name="mandalay:getStaticText">
-              <xsl:with-param name="module" select="'FileStorageItem'"/>
+	<a>
+	  <xsl:attribute name="href">
+	    <xsl:choose>
+	      <xsl:when test="$includeFileNameIntoFileLinks = 'true'">		
+		<xsl:value-of select="$dispatcher-prefix"/>/cms-service/download/asset/<xsl:value-of select="./file/name"/>?asset_id=<xsl:value-of select="./file/id"/>
+	      </xsl:when>
+	      <xsl:otherwise>
+		<xsl:value-of select="$dispatcher-prefix"/>/cms-service/download/asset/?asset_id=<xsl:value-of select="./file/id"/>
+	      </xsl:otherwise>
+	    </xsl:choose>
+	  </xsl:attribute>
+	  <!--<a href="{$dispatcher-prefix}/cms-service/download/asset/{./file/name}/?asset_id={./file/id}">-->
+	  <xsl:attribute name="title">
+	    <xsl:call-template name="mandalay:getStaticText">
+	      <xsl:with-param name="module" select="'FileStorageItem'"/>
               <xsl:with-param name="id" select="'download/title'" />
-            </xsl:call-template>
-          </xsl:attribute>
-          <xsl:call-template name="mandalay:getStaticText">
-            <xsl:with-param name="module" select="'FileStorageItem'"/>
-            <xsl:with-param name="id" select="'download/link'" />
+	    </xsl:call-template>
+	  </xsl:attribute>
+	  <xsl:call-template name="mandalay:getStaticText">
+	    <xsl:with-param name="module" select="'FileStorageItem'"/>
+	    <xsl:with-param name="id" select="'download/link'" />
           </xsl:call-template>
         </a>
       </xsl:if>
diff --git a/ccm-sci-bundle/web/themes/mandalay/lang/de/SciInstitute.xml b/ccm-sci-bundle/web/themes/mandalay/lang/de/SciInstitute.xml
index 735166da7..d9c282d3d 100644
--- a/ccm-sci-bundle/web/themes/mandalay/lang/de/SciInstitute.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/lang/de/SciInstitute.xml
@@ -26,6 +26,8 @@
   <line id="moreButton">weiter...</line>
   <line id="moreButtonTitle">mehr lesen</line>
 
+  <line id="departmentHeadPreText"> (Abteilungsleitung) </line>
+
   <line id="tabs/summary">Überblick</line>
   <line id="tabs/desc">Details</line>
   <line id="tabs/members">Mitglieder</line>
@@ -70,8 +72,8 @@
   <line id="publicationsTab/filters/heading">Publikationsliste filtern</line>
   <line id="publicationsTab/filters/submit">Filter anwenden</line>
   <line id="publicationsTab/filters/reset">Filter zurücksetzen</line>
-  <line id="publicationsTab/filters/year/label">Erscheinungsjahr</line>
-  <line id="publicationsTab/filters/year/all">Alle</line>
+  <line id="publicationsTab/filters/yearOfPublication/label">Erscheinungsjahr</line>
+  <line id="publicationsTab/filters/yearOfPublication/all">Alle</line>
   <line id="publicationsTab/filters/title/label">Titel</line>
   <line id="publicationsTab/filters/author/label">Autor (Nachname)</line>
   <line id="publicationsTab/greeting">Hier sehen Sie die aktuellsten 10 Publikationen. Weitere Publikationen finden Sie über die Filter oben.</line>
diff --git a/ccm-sci-bundle/web/themes/mandalay/lang/en/SciInstitute.xml b/ccm-sci-bundle/web/themes/mandalay/lang/en/SciInstitute.xml
index f801de61d..8e842aa86 100644
--- a/ccm-sci-bundle/web/themes/mandalay/lang/en/SciInstitute.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/lang/en/SciInstitute.xml
@@ -26,6 +26,8 @@
   <line id="moreButton">more »</line>
   <line id="moreButtonTitle">read more</line>
 
+  <line id="departmentHeadPreText"> (Abteilungsleitung) </line>
+
   <line id="tabs/summary">Overview</line>
   <line id="tabs/desc">Details</line>
   <line id="tabs/members">Members</line>
@@ -69,8 +71,8 @@
   <line id="publicationsTab/filters/heading">Filter list of publications</line>
   <line id="publicationsTab/filters/submit">Apply filters</line>
   <line id="publicationsTab/filters/reset">Reset filters</line>
-  <line id="publicationsTab/filters/year/label">Year of publication</line>
-  <line id="publicationsTab/filters/year/all">All</line>
+  <line id="publicationsTab/filters/yearOfPublication/label">Year of publication</line>
+  <line id="publicationsTab/filters/yearOfPublication/all">All</line>
   <line id="publicationsTab/filters/title/label">Title</line>
   <line id="publicationsTab/filters/author/label">Author (Surname)</line>
   <line id="publicationsTab/greeting">This list show the ten most recent publications only. More publications can be found using the filter above.</line>
diff --git a/ccm-sci-bundle/web/themes/mandalay/layout/PublicPersonalProfile.xml b/ccm-sci-bundle/web/themes/mandalay/layout/PublicPersonalProfile.xml
index 149c2a044..c9aca4979 100755
--- a/ccm-sci-bundle/web/themes/mandalay/layout/PublicPersonalProfile.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/layout/PublicPersonalProfile.xml
@@ -29,6 +29,8 @@
       <usePageTitle/>
     </title>
     <useCSSLoader/>
+    <useFancbox/>
+    <useMathJax/>
   </head>
   <body>
 
diff --git a/ccm-sci-bundle/web/themes/mandalay/layout/content-center.xml b/ccm-sci-bundle/web/themes/mandalay/layout/content-center.xml
index a147b4628..e7edecc86 100644
--- a/ccm-sci-bundle/web/themes/mandalay/layout/content-center.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/layout/content-center.xml
@@ -29,17 +29,18 @@
       <usePageTitle/>    
     </title>
     <useCSSLoader/>
+    <useMathJax/>
   </head>
   <body>
     <div id="cmsHeader">
-<showImage class="logo">
-	<src>images/logo.png</src>
-	<alt>header/logo/alt</alt>
-	<name>header/logo/name</name>
-	<link>/navigation/</link>
+      <showImage class="logo">
+        <src>images/logo.png</src>
+        <alt>header/logo/alt</alt>
+        <name>header/logo/name</name>
+        <link>/navigation/</link>
       </showImage>
- <showCMSGreeting/>
-     <showCMSGlobalNavigation>
+      <showCMSGreeting/>
+      <showCMSGlobalNavigation>
         <usePreviewLink/>
         <useContentCenterLink/>
         <useWorkspaceLink/>
@@ -48,7 +49,7 @@
       </showCMSGlobalNavigation>
      
       <showTabbedPane/>
-<showBebopContextBar>
+      <showBebopContextBar>
         <separator> > </separator>
       </showBebopContextBar>
     </div>
diff --git a/ccm-sci-bundle/web/themes/mandalay/layout/defaultLayout.xml b/ccm-sci-bundle/web/themes/mandalay/layout/defaultLayout.xml
index 188a5c4ce..2b3ff5cfb 100755
--- a/ccm-sci-bundle/web/themes/mandalay/layout/defaultLayout.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/layout/defaultLayout.xml
@@ -29,6 +29,8 @@
       <usePageTitle/>
     </title>
     <useCSSLoader/>
+    <useFancybox/>
+    <useMathJax/>
   </head>
   <body>
 
diff --git a/ccm-sci-bundle/web/themes/mandalay/layout/forum.xml b/ccm-sci-bundle/web/themes/mandalay/layout/forum.xml
index 31998acb5..2f5ccc9e8 100644
--- a/ccm-sci-bundle/web/themes/mandalay/layout/forum.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/layout/forum.xml
@@ -29,6 +29,8 @@
       <usePageTitle/>
     </title>
     <useCSSLoader/>
+    <useFancybox/>
+    <useMathJax/>
   </head>
   <body>
 
diff --git a/ccm-sci-bundle/web/themes/mandalay/layout/login.xml b/ccm-sci-bundle/web/themes/mandalay/layout/login.xml
index 97d360ff3..ae2c6f538 100644
--- a/ccm-sci-bundle/web/themes/mandalay/layout/login.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/layout/login.xml
@@ -29,6 +29,8 @@
       <usePageTitle/>
     </title>
     <useCSSLoader/>
+    <useFancybox/>
+    <useMathJax/>
   </head>
   <body>
 
diff --git a/ccm-sci-bundle/web/themes/mandalay/layout/navigation.xml b/ccm-sci-bundle/web/themes/mandalay/layout/navigation.xml
index 48737a620..b4bac46e3 100755
--- a/ccm-sci-bundle/web/themes/mandalay/layout/navigation.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/layout/navigation.xml
@@ -29,6 +29,8 @@
       <usePageTitle/>
     </title>
     <useCSSLoader/>
+    <useFancybox/>
+    <useMathJax/>
   </head>
   <body>
 
diff --git a/ccm-sci-bundle/web/themes/mandalay/layout/portal.xml b/ccm-sci-bundle/web/themes/mandalay/layout/portal.xml
index 950858331..9923e65bd 100755
--- a/ccm-sci-bundle/web/themes/mandalay/layout/portal.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/layout/portal.xml
@@ -29,6 +29,8 @@
       <usePageTitle/>
     </title>
     <useCSSLoader/>
+    <useFancbox/>
+    <useMathJax/>
   </head>
   <body>
 
diff --git a/ccm-sci-bundle/web/themes/mandalay/layout/search.xml b/ccm-sci-bundle/web/themes/mandalay/layout/search.xml
index eaf151bfe..682906f29 100755
--- a/ccm-sci-bundle/web/themes/mandalay/layout/search.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/layout/search.xml
@@ -29,6 +29,8 @@
       <usePageTitle/>
     </title>
     <useCSSLoader/>
+    <useFancybox>
+    <useMathJax/>
   </head>
   <body>
     <div id="pageWrap">
diff --git a/ccm-sci-bundle/web/themes/mandalay/layout/sitemap.xml b/ccm-sci-bundle/web/themes/mandalay/layout/sitemap.xml
index 97d360ff3..c284453f4 100755
--- a/ccm-sci-bundle/web/themes/mandalay/layout/sitemap.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/layout/sitemap.xml
@@ -29,6 +29,8 @@
       <usePageTitle/>
     </title>
     <useCSSLoader/>
+    <useFancbox/>
+    <useMathJax/>
   </head>
   <body>
 
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/SciPublicationsHarvardFormat.xml b/ccm-sci-bundle/web/themes/mandalay/settings/SciPublicationsHarvardFormat.xml
new file mode 100644
index 000000000..6841ff60e
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/SciPublicationsHarvardFormat.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0"?>
+<!-- 
+    Copyright: 2010,2011 Jens Pelzetter
+  
+    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/>.
+-->
+
+<!-- 
+
+This file defines the format for bibliographic references in lists.
+-->
+
+<bibrefFormat>
+
+  <!-- 
+       Format for an article in a collected volume. The collected volume information is formated using the
+       format definied by <bibrefCollectedVolumeFormat>.
+  -->
+  <bibrefArticleInCollectedVolumeFormat>
+    <authors after=", "/><year after=". "/><title/><collectedVolume before=". " preText="collectedVolumePreText"/><pages before=", " after=". " betweenText="pagesBetweenText"/>
+  </bibrefArticleInCollectedVolumeFormat>
+
+  <!-- 
+       Format for an article in a journal. The journal information is formated using the format defined 
+       by <bibrefJournalFormat>.
+  -->
+  <bibrefArticleInJournalFormat>
+    <authors after=", "/><year after=". "/><title/><journal before=". "/><volume before=", "/><issue before=" "/><pages before=", " betweenText="pagesBetweenText"/>
+  </bibrefArticleInJournalFormat>
+
+  <!--
+      Format for a collected volume.
+  -->
+  <bibrefCollectedVolumeFormat>
+    <authors after=", "/><year after=". " /><title/><edition before=". "/><publisher before=". " after=". "/>
+  </bibrefCollectedVolumeFormat>
+
+  <!-- 
+       Format for an expertise 
+  -->
+  <bibrefExpertiseFormat>
+    <authors after=", "/><year after=". "/><title/><place before=". "/><organization before=": "/>
+  </bibrefExpertiseFormat>
+
+  <!--
+      Format for grey literature
+  -->
+  <bibrefGreyLiteratureFormat>
+    <authors after=", "/><year after=". "/><title/><place before=". "/><organization before=": "/>
+  </bibrefGreyLiteratureFormat>
+
+  <!-- 
+       Format for a in proceedings publications. The proceedings part is formated using the
+       format definied by <bibrefProceedingsFormat>
+  -->
+  <bibrefInProceedingsFormat>
+    <authors after=", "/><year after=". "/><title/><proceedings before=". " preText="inProceedingsPreText"/>
+  </bibrefInProceedingsFormat>
+
+  <!--
+      Format for a InternetArticle 
+  -->
+  <bibrefInternetArticleFormat>
+    <authors after=", "/><year after=". "/><title/><place before=". "/><organization before=": "/><url preText="urlPreText"/>
+  </bibrefInternetArticleFormat>
+
+  <!-- 
+       Format for a journal 
+  -->
+  <bibrefJournalFormat>
+    <title/>
+  </bibrefJournalFormat>
+  
+  <!-- Format for a monograph -->
+  <bibrefMonographFormat>
+    <authors after=", "/><year after=". "/><title/><edition before=". "/><publisher before=". " after=". "/>
+  </bibrefMonographFormat>
+
+  <bibrefProceedingsFormat>    
+    <authors after=", "/><organizaztion after=", "/><year after=". "/><title/><placeOfConference before=". "/><dateOfConference before=", "/><publisher after=", "/>
+  </bibrefProceedingsFormat>
+
+  <!-- Format for a review -->
+  <bibrefReviewFormat>
+    <authors after=", "/><year after=". "/><title/><journal before=". "/><volume before=", "/><issue before=" "/><pages before=", " betweenText="pagesBetweenText"/>
+  </bibrefReviewFormat>
+
+<bibrefWorkingPaperFormat>
+  <authors after=", "/><year after=". "/><title/><place before=". "/><organization before=": "/>
+</bibrefWorkingPaperFormat>
+
+  <!--
+      ***************************
+      Subformats for authors etc.
+      ***************************
+  -->
+
+
+  <!-- Format for authors -->
+  <bibrefAuthorFormat separator="; ">
+    <surname after=", "/><givenName initialsOnly="true"/><editor/>
+  </bibrefAuthorFormat>
+
+  <!-- Format for publisher -->
+  <bibrefPublisherFormat>
+    <place after=": "/><name/>
+  </bibrefPublisherFormat>
+
+  <!-- Format for in series data, if any -->
+  <bibrefInSeriesFormat setPreText="true">
+    <editor/><year before="(" after=") "/><title after=". "/><publisher after=". "/>
+  </bibrefInSeriesFormat>
+ 
+  <!-- Format for the editor of an series -->
+  <bibrefInSeriesEditorFormat after="; ">
+    <surname after=", "/><givenName initialsOnly="true"/>
+  </bibrefInSeriesEditorFormat>
+
+
+</bibrefFormat>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/global.xml b/ccm-sci-bundle/web/themes/mandalay/settings/global.xml
index 98c612c0b..894ea0c4a 100755
--- a/ccm-sci-bundle/web/themes/mandalay/settings/global.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/global.xml
@@ -27,4 +27,6 @@
   <setting id="css/media">print</setting>
 
   <setting id="separator"> | </setting>
+
+  <setting id="includeFileNameIntoFileLinks">false</setting>
 </settings>
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/imageGallery.xml b/ccm-sci-bundle/web/themes/mandalay/settings/imageGallery.xml
index e845415b5..fe9538c99 100644
--- a/ccm-sci-bundle/web/themes/mandalay/settings/imageGallery.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/imageGallery.xml
@@ -63,5 +63,6 @@
   <setting id="onCleanup"></setting>
   <setting id="onClose"></setting>
 -->
+  <setting id="type">image</setting>
   <setting id=""></setting>
 </settings>
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 21036cde2..905c84963 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/mandalay.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/mandalay.xsl
@@ -40,7 +40,7 @@
   <!--
     <xsl:import href="types/XXX.xsl"/>
   -->
-  <xsl:import href="mandalay/headerImage.xsl"/>
+  <xsl:import href="mandalay/dynamicImage.xsl"/>
   <xsl:import href="mandalay/homepageTitle.xsl"/>
   <xsl:import href="mandalay/layoutParser.xsl"/>
   
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/mandalay/headerImage.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/mandalay/dynamicImage.xsl
similarity index 88%
rename from ccm-sci-bundle/web/themes/mandalay/user/includes/mandalay/headerImage.xsl
rename to ccm-sci-bundle/web/themes/mandalay/user/includes/mandalay/dynamicImage.xsl
index d004542f0..4c3a602e6 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/mandalay/headerImage.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/mandalay/dynamicImage.xsl
@@ -28,35 +28,35 @@
     exclude-result-prefixes="xsl bebop cms mandalay nav"
     version="1.0">
 
-  <xsl:template name="mandalay:headerImage">
+  <xsl:template name="mandalay:dynamicImage">
    
     <xsl:variable name="path">
-      <xsl:call-template name="mandalay:headerImagePath"/>
+      <xsl:call-template name="mandalay:dynamicImagePath"/>
     </xsl:variable>
 
     <xsl:variable name="src">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="node" select="''"/>
-        <xsl:with-param name="module" select="'headerImage'"/>
+        <xsl:with-param name="module" select="@class"/>
         <xsl:with-param name="setting" select="concat($path, 'src')"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="alt">
       <xsl:call-template name="mandalay:getStaticText">
-        <xsl:with-param name="module" select="'headerImage'"/>
+        <xsl:with-param name="module" select="@class"/>
         <xsl:with-param name="id" select="concat($path, 'alt')"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="title">
       <xsl:call-template name="mandalay:getStaticText">
-        <xsl:with-param name="module" select="'headerImage'"/>
+        <xsl:with-param name="module" select="@class"/>
         <xsl:with-param name="id" select="concat($path, 'title')"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="name">
       <xsl:call-template name="mandalay:getStaticText">
-        <xsl:with-param name="module" select="'headerImage'"/>
+        <xsl:with-param name="module" select="@class"/>
         <xsl:with-param name="id" select="concat($path, 'name')"/>
       </xsl:call-template>
     </xsl:variable>
@@ -88,14 +88,14 @@
     </img>
   </xsl:template>
   
-  <xsl:template name="mandalay:headerImagePath">
+  <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="foundSetting">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="node" select="''"/>
-        <xsl:with-param name="module" select="'headerImage'"/>
+        <xsl:with-param name="module" select="@class"/>
         <xsl:with-param name="setting" select="concat($path, 'src')"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
@@ -105,7 +105,7 @@
       <xsl:choose>
 
         <xsl:when test="$foundSetting = '' and $position > 0 ">
-          <xsl:call-template name="mandalay:headerImagePath">
+          <xsl:call-template name="mandalay:dynamicImagePath">
             <xsl:with-param name="position" select="$position -1"/>
           </xsl:call-template>
         </xsl:when>
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 112494d14..223a43a76 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
@@ -49,10 +49,10 @@
   </xsl:template>
   -->
 
-  <xsl:template match="showHeaderImage">
+  <xsl:template match="showDynamicImage">
     <div>
       <xsl:call-template name="mandalay:setParameters"/>
-      <xsl:call-template name="mandalay:headerImage"/>
+      <xsl:call-template name="mandalay:dynamicImage"/>
     </div>
   </xsl:template>
 
@@ -90,4 +90,4 @@
      </xsl:call-template>       
   </xsl:template>
 
-</xsl:stylesheet> 
\ No newline at end of file
+</xsl:stylesheet> 
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciInstitute/SciInstituteSummaryTab.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciInstitute/SciInstituteSummaryTab.xsl
index 6bcf830f7..4b4135d79 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciInstitute/SciInstituteSummaryTab.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciInstitute/SciInstituteSummaryTab.xsl
@@ -188,75 +188,75 @@
 	    </a>
 	    <br/>
 	    <xsl:if test="count(./heads/head) &gt; 0">
-	    <xsl:call-template name="mandalay:getStaticText">
-	      <xsl:with-param name="module" select="'SciInstitute'"/>
-	      <xsl:with-param name="id" select="'departmentHeadPreText'"/>
-	    </xsl:call-template>
-	    <xsl:for-each select="./heads/head">
-	      <xsl:choose>
-		<xsl:when test="($linkHeads = 'true') and (./contacts/contactentries[keyId='homepage'])">
-		  <a class="memberName">
-		    <xsl:attribute name="href"><xsl:value-of select="./contacts/contactentries[keyId='homepage']/value"/></xsl:attribute>
-		    <xsl:if test="string-length(./titlePre) &gt; 0">
-		      <xsl:value-of select="./titlePre"/>
-		      <xsl:text> </xsl:text>
-		    </xsl:if>
-		    <xsl:if test="string-length(./titlepre) &gt; 0">
-		      <xsl:value-of select="./titlepre"/>
-		      <xsl:text> </xsl:text>
-		    </xsl:if>
-		    <xsl:if test="string-length(./givenname) &gt; 0">
-		      <xsl:value-of select="./givenname"/>
+	      <xsl:call-template name="mandalay:getStaticText">
+		<xsl:with-param name="module" select="'SciInstitute'"/>
+		<xsl:with-param name="id" select="'departmentHeadPreText'"/>
+	      </xsl:call-template>
+	      <xsl:for-each select="./heads/head">
+		<xsl:choose>
+		  <xsl:when test="($linkHeads = 'true') and (./contacts/contactentries[keyId='homepage'])">
+		    <a class="memberName">
+		      <xsl:attribute name="href"><xsl:value-of select="./contacts/contactentries[keyId='homepage']/value"/></xsl:attribute>
+		      <xsl:if test="string-length(./titlePre) &gt; 0">
+			<xsl:value-of select="./titlePre"/>
+			<xsl:text> </xsl:text>
+		      </xsl:if>
+		      <xsl:if test="string-length(./titlepre) &gt; 0">
+			<xsl:value-of select="./titlepre"/>
+			<xsl:text> </xsl:text>
+		      </xsl:if>
+		      <xsl:if test="string-length(./givenname) &gt; 0">
+			<xsl:value-of select="./givenname"/>
+			<xsl:text> </xsl:text>		    
+		      </xsl:if>
+		      <xsl:if test="string-length(./givenname) &gt; 0">
+			<xsl:value-of select="./surname"/>
+		      </xsl:if>
+		      <xsl:if test="string-length(./titlePost) &gt; 0">
+			<xsl:text>, </xsl:text>
+			<xsl:value-of select="./titlePost"/>
+		      </xsl:if>	 
+		      <xsl:if test="string-length(./titlepost) &gt; 0">
+			<xsl:text>, </xsl:text>
+			<xsl:value-of select="./titlepost"/>
+		      </xsl:if>	 
+		      <xsl:if test="(count(../head) &gt; 1) and (position() != last())">
+			<xsl:text>, </xsl:text>
+		      </xsl:if>
+		    </a>
+		  </xsl:when>	
+		  <xsl:otherwise>
+		    <span class="memberName">
+		      <xsl:if test="string-length(./titlePre) &gt; 0">
+			<xsl:value-of select="./titlePre"/>
+			<xsl:text> </xsl:text>
+		      </xsl:if>
+		      <xsl:if test="string-length(./titlepre) &gt; 0">
+			<xsl:value-of select="./titlepre"/>
+			<xsl:text> </xsl:text>
+		      </xsl:if>
+		      <xsl:if test="string-length(./givenname) &gt; 0">
+			<xsl:value-of select="./givenname"/>
 		      <xsl:text> </xsl:text>		    
-		    </xsl:if>
-		    <xsl:if test="string-length(./givenname) &gt; 0">
-		      <xsl:value-of select="./surname"/>
-		    </xsl:if>
-		    <xsl:if test="string-length(./titlePost) &gt; 0">
-		      <xsl:text>, </xsl:text>
-		      <xsl:value-of select="./titlePost"/>
-		    </xsl:if>	 
-		    <xsl:if test="string-length(./titlepost) &gt; 0">
-		    <xsl:text>, </xsl:text>
-		    <xsl:value-of select="./titlepost"/>
-		    </xsl:if>	 
-		    <xsl:if test="(count(../head) &gt; 1) and (position() != last())">
-		      <xsl:text>, </xsl:text>
-		    </xsl:if>
-		  </a>
-		</xsl:when>	
-		<xsl:otherwise>
-		  <span class="memberName">
-		    <xsl:if test="string-length(./titlePre) &gt; 0">
-		      <xsl:value-of select="./titlePre"/>
-		      <xsl:text> </xsl:text>
-		    </xsl:if>
-		    <xsl:if test="string-length(./titlepre) &gt; 0">
-		      <xsl:value-of select="./titlepre"/>
-		  <xsl:text> </xsl:text>
-		    </xsl:if>
-		    <xsl:if test="string-length(./givenname) &gt; 0">
-		      <xsl:value-of select="./givenname"/>
-		      <xsl:text> </xsl:text>		    
-		    </xsl:if>
-		    <xsl:if test="string-length(./givenname) &gt; 0">
-		      <xsl:value-of select="./surname"/>
-		    </xsl:if>
-		    <xsl:if test="string-length(./titlePost) &gt; 0">
-		      <xsl:text>, </xsl:text>
-		      <xsl:value-of select="./titlePost"/>
-		    </xsl:if>	 
-		    <xsl:if test="string-length(./titlepost) &gt; 0">
-		      <xsl:text>, </xsl:text>
-		      <xsl:value-of select="./titlepost"/>
-		    </xsl:if>	 
-		    <xsl:if test="(count(../head) &gt; 1) and (position() != last())">
-		      <xsl:text>, </xsl:text>
-		    </xsl:if>
-		  </span>
-		</xsl:otherwise>
-	      </xsl:choose>
-	    </xsl:for-each>
+		      </xsl:if>
+		      <xsl:if test="string-length(./givenname) &gt; 0">
+			<xsl:value-of select="./surname"/>
+		      </xsl:if>
+		      <xsl:if test="string-length(./titlePost) &gt; 0">
+			<xsl:text>, </xsl:text>
+			<xsl:value-of select="./titlePost"/>
+		      </xsl:if>	 
+		      <xsl:if test="string-length(./titlepost) &gt; 0">
+			<xsl:text>, </xsl:text>
+			<xsl:value-of select="./titlepost"/>
+		      </xsl:if>	 
+		      <xsl:if test="(count(../head) &gt; 1) and (position() != last())">
+			<xsl:text>, </xsl:text>
+		      </xsl:if>
+		    </span>
+		  </xsl:otherwise>
+		</xsl:choose>
+	      </xsl:for-each>
 	    </xsl:if>
 	  </li>
 	</xsl:for-each>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciMember/SciMember.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciMember/SciMember.xsl
index c6a29842b..0c971fa09 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciMember/SciMember.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciMember/SciMember.xsl
@@ -251,11 +251,20 @@
 	    </span>		    
 	    <span class="contactentryValue">
 	      <xsl:choose>
-		<xsl:when test="contains(./value, '@')">
+		<xsl:when test="(substring(./value, 1, 7) = 'http://') or (substring(./value, 1, 3) = 'www') or contains(./value, '@')">
 		  <a>
-		    <xsl:attribute name="href">
-		      <xsl:value-of select="concat('mailto:', ./value)"/>
-		    </xsl:attribute>
+		    <xsl:choose>
+		      <xsl:when test="contains(./value, '@')">
+			<xsl:attribute name="href">
+			  <xsl:value-of select="concat('mailto:', ./value)"/>
+			</xsl:attribute>
+		      </xsl:when>
+		      <xsl:otherwise>
+			<xsl:attribute name="href">
+			  <xsl:value-of select="./value"/>
+			</xsl:attribute>
+		      </xsl:otherwise>
+		    </xsl:choose>
 		    <xsl:value-of select="./value"/>
 		  </a>
 		</xsl:when>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciProject/SciProject.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciProject/SciProject.xsl
index 2a633f169..208ae66c0 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciProject/SciProject.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciProject/SciProject.xsl
@@ -338,4 +338,140 @@
       </xsl:if> 
   </xsl:template>
 
+  <xsl:template name="CT_SciProject_Link" 
+		match="*/cms:item/links[targetItem/objectType = 'com.arsdigita.cms.contenttypes.SciProject']" 
+		mode="link_view">
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setImageAndText">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciMember'"/>
+        <xsl:with-param name="setting" select="'linkView/setImageAndText'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciMember'"/>
+        <xsl:with-param name="setting" select="'linkView/setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageMaxHeight">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciMember'"/>
+        <xsl:with-param name="setting" select="'linkView/setImageMaxHeight'"/>
+        <xsl:with-param name="default" select="''"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageMaxWidth">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciMember'"/>
+        <xsl:with-param name="setting" select="'linkView/setImageMaxWidth'"/>
+        <xsl:with-param name="default" select="''"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageCaption">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciMember'"/>
+        <xsl:with-param name="setting" select="'linkView/setImageCaption'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setDescription">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciMember'"/>
+        <xsl:with-param name="setting" select="'linkView/setDescription'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setDescriptionLength">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciMember'"/>
+        <xsl:with-param name="setting" select="'linkView/setDescriptionLength'"/>
+        <xsl:with-param name="default" select="'0'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setMoreButton">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciMember'"/>
+        <xsl:with-param name="setting" select="'linkView/setMoreButton'"/>
+        <xsl:with-param name="default" select="'false'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <!-- DE Wenn es Bilder gibt, dann soll das erste hier als Link angezeigt werden -->
+    <!-- EN -->
+    <xsl:if test="./targetItem/imageAttachments and $setImage = 'true'">
+      <a>
+        <xsl:attribute name="href"><xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="./targetItem/@oid"/></xsl:attribute>
+        <xsl:attribute name="title">
+          <xsl:call-template name="mandalay:shying">
+            <xsl:with-param name="title">
+              <xsl:value-of select="./linkTitle"/>
+            </xsl:with-param>
+            <xsl:with-param name="mode">dynamic</xsl:with-param>
+          </xsl:call-template>
+        </xsl:attribute>
+        <xsl:for-each select="./targetItem">
+          <xsl:call-template name="mandalay:imageAttachment">
+            <xsl:with-param name="showCaption" select="$setImageCaption" />
+            <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+            <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+          </xsl:call-template>
+        </xsl:for-each>
+      </a>
+    </xsl:if>
+    <xsl:if test="$setImageAndText = 'true' or not(./targetItem/imageAttachments) or $setImage = 'false'">
+      <a class="CIname">
+        <xsl:attribute name="href"><xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="./targetItem/@oid"/></xsl:attribute>
+        <xsl:attribute name="title">
+          <xsl:call-template name="mandalay:shying">
+            <xsl:with-param name="title">
+              <xsl:value-of select="./linkTitle"/>
+            </xsl:with-param>
+            <xsl:with-param name="mode">dynamic</xsl:with-param>
+          </xsl:call-template>
+        </xsl:attribute>
+        <xsl:call-template name="mandalay:shying">
+          <xsl:with-param name="title">
+            <xsl:value-of disable-output-escaping="yes" select="./linkTitle"/>
+          </xsl:with-param>
+          <xsl:with-param name="mode">dynamic</xsl:with-param>
+        </xsl:call-template>
+      </a>
+      <xsl:if test="./linkDescription and $setDescription">
+        <br />
+        <xsl:choose>
+          <xsl:when test="$setDescriptionLength = '0'">
+            <xsl:value-of disable-output-escaping="yes" select="./linkDescription" />
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of disable-output-escaping="yes" select="substring(./linkDescription, 1, $setDescriptionLength)" />
+            <xsl:if test="string-length(./linkDescription) > $setDescriptionLength">
+              <xsl:text>...</xsl:text>
+              <xsl:if test="$setMoreButton = 'true'">
+                <span class="moreButton">
+                  <a>
+                    <xsl:attribute name="href"><xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="./targetItem/@oid"/></xsl:attribute>
+                    <xsl:attribute name="title">
+                      <xsl:call-template name="mandalay:getStaticText">
+                        <xsl:with-param name="module" select="'SciMember'"/>
+                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
+                      </xsl:call-template>
+                    </xsl:attribute>
+                    <xsl:call-template name="mandalay:getStaticText">
+                      <xsl:with-param name="module" select="'SciMember'"/>
+                      <xsl:with-param name="id" select="'moreButton'"/>
+                    </xsl:call-template>
+                  </a> 
+                </span>
+              </xsl:if>
+            </xsl:if>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:if>
+    </xsl:if>
+  </xsl:template>
+
 </xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/formatParser.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/formatParser.xsl
index 722551559..9a874bba7 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/formatParser.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/formatParser.xsl
@@ -1592,7 +1592,7 @@
 	</xsl:otherwise>
       </xsl:choose>
 
-      <xsl:if test="($titleLastChar != '.') and ($titleLastChar != '!') and titleLastChar != '?'">
+      <xsl:if test="($titleLastChar != '.') and ($titleLastChar != '!') and ($titleLastChar != '?')">
 	<xsl:value-of select="./@after"/>
       </xsl:if>
     </span>
@@ -1854,7 +1854,7 @@
 	  <span class="publicationAuthorGivenName">
 	    <xsl:choose>
 	      <xsl:when test="./@initialsOnly='true'">
-		<xsl:value-of select="substring($givenName, 1, 2)"/>
+		<xsl:value-of select="substring($givenName, 1, 2)"/><xsl:text>.</xsl:text>
 	      </xsl:when>
 	      <xsl:otherwise>
 		<xsl:value-of select="$givenName"/>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/siteProxy/dabin.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/siteProxy/dabin.xsl
index 433fa5c7a..20171a310 100755
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/siteProxy/dabin.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/siteProxy/dabin.xsl
@@ -31,6 +31,25 @@
 
   <!-- DE Liste mit DaBIn-Ausgaben -->
   <xsl:template match="dabin:list">
+    <xsl:if test="./dabin:menu">
+      <span class="dabinMenu">
+	<xsl:for-each select="./dabin:menu/dabin:entry">
+	  <span>
+	    <xsl:if test="./@active = 'true'">
+	      <xsl:attribute name="class">active</xsl:attribute>
+	    </xsl:if>
+	    <a>
+	      <xsl:attribute name="href">?<xsl:value-of select="./@linkParam"/></xsl:attribute>
+	      <xsl:call-template name="mandalay:getStaticText">
+		<xsl:with-param name="module" select="'DaBIn'"/>
+		<xsl:with-param name="id" select="concat('menu/', ./@value)"/>
+	      </xsl:call-template>
+	    </a>
+	  </span>      
+	  <xsl:if test="position() != last()"> | </xsl:if>
+	</xsl:for-each>
+      </span>
+    </xsl:if>
     <ul class="dabinList">
       <xsl:apply-templates mode="list_view"/>
     </ul>