Neue Version von Mandalay

git-svn-id: https://svn.libreccm.org/ccm/trunk@2291 8810af33-2d31-482b-a856-94f89814c4df

ccm-sci-bundle/web/themes/mandalay/css/screen/global/basic.css

@@ -1026,6 +1026,20 @@ div.image span.caption {
   display: none;
 }
 
+div.image.left {
+  float: left !important;
+}
+
+div.image.center {
+  float: none !important;
+  text-align: center;
+}
+
+div.image.right {
+  float: right !important;
+}
+
+
 /*-------CT NewsItem--------*/
 
 #content #newsDate {
@@ -1446,3 +1460,43 @@ ul.publicationsAuthorsList li {
   clear:both;
  }
 
+div#greetingitem div.editLink {
+    display: none;
+}
+
+div#greetingitem:hover {
+    position: relative;
+}
+
+div#greetingitem:hover div.editLink {
+    display: block;
+    position: absolute;
+    top: 0.5em;
+    right: 0.5em;
+}
+
+div#itemList li div.editLink{
+    display: none;
+}
+
+div#itemList li:hover {
+    position: relative;
+}
+
+div#itemList li:hover div.editLink {
+    display: block;
+    position: absolute;
+    top: 0.1em;
+    right: 0.1em;
+}
+
+div.contentDefaultLayout {
+    position: relative;
+}
+
+div.contentDefaultLayout div.editLink {
+    position: absolute;
+    right: 1em;
+    top: 3em;
+}
+

ccm-sci-bundle/web/themes/mandalay/images/filters.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg baseProfile="full" xmlns="http://www.w3.org/2000/svg">
+ <filter id="grayscale">
+  <feColorMatrix type="saturate" values="0"/>
+ </filter>
+ <filter id="desaturate">
+  <feColorMatrix type="saturate" values="0.3"/>
+ </filter>
+</svg>

ccm-sci-bundle/web/themes/mandalay/includes/bebop.xsl

@@ -61,6 +61,7 @@
   <xsl:import href="bebop/bebopPage.xsl"/>
   <xsl:import href="bebop/bebopPanel.xsl"/>
   <xsl:import href="bebop/bebopPropertyList.xsl"/>
+  <xsl:import href="bebop/bebopSystemInformation.xsl"/>
   <xsl:import href="bebop/bebopTabbedPane.xsl"/>
   <xsl:import href="bebop/bebopTable.xsl"/>
   <xsl:import href="bebop/bebopTree.xsl"/>

ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopContextBar.xsl

@@ -74,12 +74,14 @@
         </span>
       </xsl:when>
       <xsl:otherwise>
+        <span class="bebopContextBarElement">
           <a href="{@href}">
             <xsl:value-of select="@title"/>
           </a>
           <span class="bebopContextBarSeperator">
             <xsl:value-of select="$separator"/>
           </span>
+        </span>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>

ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopSystemInformation.xsl

@@ -0,0 +1,59 @@
+<?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 werden die Bebop-Seiten verarbeitet 
+-->
+
+<!-- EN
+    Processing bebop pages
+-->
+
+<!-- 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" 
+  version="1.0">
+
+  <!-- DE Schreibe den PageState in versteckte Input-Felder -->
+  <!-- EN Save the page state in hidden input fields -->
+  <xsl:template match="bebop:systemInformation">
+    <a>
+      <xsl:attribute name="href">
+        <xsl:call-template name="mandalay:linkParser">
+          <xsl:with-param name="link" select="@apphomepage"/>
+        </xsl:call-template>
+      </xsl:attribute>
+      <xsl:value-of select="@appname"/>
+    </a>
+    <xsl:text>&nbsp;</xsl:text>
+    <span class="version">
+      <xsl:value-of select="@version"/>
+    </span>
+  </xsl:template>
+
+</xsl:stylesheet>

ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopTabbedPane.xsl

@@ -99,9 +99,15 @@
   <!-- DE Verarbeite den Inhalt eines Tabs -->
   <!-- EN Process the contents of a tab -->
   <xsl:template match="bebop:tab">
+    <xsl:attribute name="class">
+      <xsl:text>bebopTab </xsl:text>
+      <xsl:value-of select="@key"/>
+      <xsl:if test="@current='t'">
+        <xsl:text> current</xsl:text>
+      </xsl:if>
+    </xsl:attribute>
     <xsl:choose>
       <xsl:when test="@current='t'">
-        <xsl:attribute name="class">bebopTab current</xsl:attribute>
         <xsl:apply-templates/>
       </xsl:when>
       <xsl:otherwise>

ccm-sci-bundle/web/themes/mandalay/includes/mandalay/fileAttachments.xsl

@@ -54,6 +54,14 @@
           <xsl:with-param name="default" select="'true'"/>
         </xsl:call-template>
       </xsl:variable>
+      <xsl:variable name="setHeadingPerItem">
+        <xsl:call-template name="mandalay:getSetting">
+          <xsl:with-param name="node"  select="$layoutTree/setHeadingPerItem"/>
+          <xsl:with-param name="module"  select="'fileAttachments'"/>
+          <xsl:with-param name="setting" select="'setHeadingPerItem'"/>
+          <xsl:with-param name="default" select="'false'"/>
+        </xsl:call-template>
+      </xsl:variable>
       <xsl:variable name="setDescription">
         <xsl:call-template name="mandalay:getSetting">
           <xsl:with-param name="node"  select="$layoutTree/setDescription"/>
@@ -78,9 +86,8 @@
         </xsl:call-template>
       </xsl:variable>
 
-
       <div class="fileAttachments">
-        <xsl:if test="$setHeading='true'">
+        <xsl:if test="$setHeading='true' and $setHeadingPerItem='false'">
           <h2>
             <xsl:call-template name="mandalay:getStaticText">
               <xsl:with-param name="module" select="'fileAttachments'"/>
@@ -92,6 +99,14 @@
           <xsl:for-each select="$resultTree//cms:item/fileAttachments">
             <xsl:sort data-type="number" select="fileOrder"/>
             <li>
+              <xsl:if test="$setHeading='true' and $setHeadingPerItem='true'">
+                <h2>
+                  <xsl:call-template name="mandalay:getStaticText">
+                    <xsl:with-param name="module" select="'fileAttachments'"/>
+                    <xsl:with-param name="id" select="'heading'"/>
+                  </xsl:call-template>
+                </h2>
+              </xsl:if>
               <a>
                 <xsl:choose>
                   <xsl:when test="$includeFileNameIntoFileLinks = 'true'">
@@ -105,16 +120,16 @@
                     </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>
               <xsl:if test="$setDescription='true'">
-                <br />
+                <div class="text">
                   <xsl:value-of select="description"/>
+                </div>
               </xsl:if>
               <xsl:if test="$setDownload='true'">
-                <br />
+                <div class="download">
                   <a>
                     <xsl:choose>
                       <xsl:when test="$includeFileNameIntoFileLinks = 'true'">
@@ -128,7 +143,6 @@
                         </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'"/>
@@ -140,6 +154,7 @@
                     <xsl:with-param name="id" select="'download/link'" />
                     </xsl:call-template>
                   </a>
+                </div>
               </xsl:if>
             </li>
           </xsl:for-each>

ccm-sci-bundle/web/themes/mandalay/includes/mandalay/formbuilder.xsl

@@ -150,8 +150,8 @@
   <!-- Hier kommen die Templates für die Formular-Komponenten, die untergeordnete Komponenten enthalten. -->
   <!-- Diese Komponenten bekommen ein umschließendes DIV-Tag und führen eine Rekursion aus.-->
   <xsl:template name="mandalay:Form_Section">
-    <div id="section">
-      <span id="title">
+    <div class="section">
+      <span class="title">
         <xsl:value-of select="./formSectionItem/title"/>
       </span>
 
@@ -177,7 +177,7 @@
 
   <!-- WidgetLabel -->
   <xsl:template name="mandalay:Form_WidgetLabel">
-    <div id="component">
+    <div class="component">
 
       <!-- Untergeordnete Komonenten verarbeiten -->
       <xsl:for-each select="./widget">
@@ -188,7 +188,7 @@
   </xsl:template>
 
   <xsl:template name="mandalay:Form_ButtonGroup">
-    <div id="group">
+    <div class="group">
       <xsl:call-template name="mandalay:Form_Title"/>
 
       <!-- Untergeordnete Komponenten verarbeiten -->
@@ -204,7 +204,7 @@
   </xsl:template>
 
   <xsl:template name="mandalay:Form_Select">
-    <div id="select">
+    <div class="select">
       <xsl:call-template name="mandalay:Form_Title"/>
 
         <select>
@@ -268,27 +268,27 @@
       <xsl:call-template name="mandalay:Form_Other"/>
 
       <!-- Ende der Div-Box markieren, damit der floating Span komplett in der Div-Box ist -->
-      <span id="boxend"></span>
+      <span class="boxend"></span>
     </div>
   </xsl:template>
 
 
   <!-- Ab hier kommen die Templates für die einfachen Komponenten -->
   <xsl:template name="mandalay:Form_Heading">
-    <div id="heading">
+    <div class="heading">
       <xsl:value-of disable-output-escaping="yes" select="./description"/>
     </div>
   </xsl:template>
 
   <xsl:template name="mandalay:Form_Text">
-    <div id="text">
+    <div class="text">
       <xsl:value-of disable-output-escaping="yes" select="./description"/>
     </div>
   </xsl:template>
 
   <xsl:template name="mandalay:Form_TextField">
     <xsl:call-template name="mandalay:Form_Label"/>
-    <span id="textfield">
+    <span class="textfield">
       <input>
         <xsl:attribute name="type">text</xsl:attribute>
         <xsl:if test="./size > 0">
@@ -308,7 +308,7 @@
 
   <xsl:template name="mandalay:Form_Password">
     <xsl:call-template name="mandalay:Form_Label"/>
-    <span id="textfield">
+    <span class="textfield">
       <input>
         <xsl:attribute name="type">password</xsl:attribute>
         <xsl:if test="./size > 0">
@@ -324,7 +324,7 @@
   </xsl:template>
 
   <xsl:template name="mandalay:Form_Hidden">
-    <span id="hidden">
+    <span class="hidden">
       <input>
         <xsl:attribute name="type">hidden</xsl:attribute>
         <xsl:if test="./size > 0">
@@ -340,7 +340,7 @@
   </xsl:template>
 
   <xsl:template name="mandalay:Form_HiddenIDGenerator">
-    <span id="hidden">
+    <span class="hidden">
       <input>
         <xsl:attribute name="type">hidden</xsl:attribute>
         <xsl:if test="./size > 0">
@@ -356,7 +356,7 @@
 
   <xsl:template name="mandalay:Form_EmailField">
     <xsl:call-template name="mandalay:Form_Label"/>
-    <span id="textfield">
+    <span class="textfield">
       <input>
         <xsl:attribute name="type">text</xsl:attribute>
         <xsl:attribute name="name"><xsl:value-of select="./parameterName"/></xsl:attribute>
@@ -384,7 +384,7 @@
 
   <xsl:template name="mandalay:Form_Date">
     <xsl:call-template name="mandalay:Form_Label"/>
-    <span id="date">
+    <span class="date">
 
 <!-- setting ??-->
 <!-- static ??-->
@@ -431,7 +431,7 @@
   </xsl:template>
   
   <xsl:template name="mandalay:Form_TextArea">
-    <div id="textarea">
+    <div class="textarea">
     <xsl:call-template name="mandalay:Form_Title"/>
       <textarea>
         <xsl:attribute name="name"><xsl:value-of select="./parameterName"/></xsl:attribute>
@@ -443,7 +443,7 @@
   </xsl:template>
 
   <xsl:template name="mandalay:Form_Ruler">
-    <span id="ruler">
+    <span class="ruler">
       <hr />
     </span>
   </xsl:template>
@@ -454,7 +454,7 @@
 
       <!-- ButtonGroups -->
       <xsl:when test="../defaultDomainClass = 'com.arsdigita.formbuilder.PersistentCheckboxGroup' or ../defaultDomainClass = 'com.arsdigita.formbuilder.PersistentRadioGroup'">
-        <div id="option">
+        <div class="option">
           <input>
 
             <!-- Unterscheide die Art der Auswahlliste-->
@@ -500,7 +500,7 @@
   </xsl:template>
 
   <xsl:template name="mandalay:Form_Button">
-    <span id="button">
+    <span class="button">
       <input>
         <xsl:attribute name="type"><xsl:value-of select="./parameterName"/></xsl:attribute>
         <xsl:attribute name="name"><xsl:value-of select="./parameterName"/></xsl:attribute>
@@ -519,9 +519,9 @@
   <!-- Hilfstemplates -->
   <!-- Setze den Label der Komponente -->
   <xsl:template name="mandalay:Form_Label">
-    <span id="label">
+    <span class="label">
       <xsl:if test="./widgetrequired = 'true'">
-        <xsl:attribute name="class">mandatory</xsl:attribute>
+        <xsl:attribute name="class">label mandatory</xsl:attribute>
       </xsl:if>
       <xsl:value-of disable-output-escaping="yes" select="../label"/>
     </span>
@@ -529,9 +529,9 @@
 
   <!-- Setze den Titel einer Box -->
   <xsl:template name="mandalay:Form_Title">
-    <span id="title">
+    <span class="title">
       <xsl:if test="./widgetrequired = 'true'">
-        <xsl:attribute name="class">mandatory</xsl:attribute>
+        <xsl:attribute name="class">title mandatory</xsl:attribute>
       </xsl:if>
       <xsl:value-of disable-output-escaping="yes" select="../label"/>
     </span>
@@ -547,12 +547,12 @@
           <xsl:when test="./defaultDomainClass = 'com.arsdigita.formbuilder.PersistentSingleSelect' or ./defaultDomainClass = 'com.arsdigita.formbuilder.PersistentMultipleSelect' or ./defaultDomainClass = 'com.arsdigita.formbuilder.DataDrivenSelect'">
             <xsl:attribute name="id">other</xsl:attribute>
             <xsl:if test="./optiongroupotherheight = 1">
-              <span id="label">
+              <span class="label">
                 <xsl:value-of select="./optiongroupotherlabel"/>
               </span>
             </xsl:if>
             <xsl:if test="./optiongroupotherheight > 1">
-              <span id="title">
+              <span class="title">
                 <xsl:value-of select="./optiongroupotherlabel"/>
               </span>
             </xsl:if>

ccm-sci-bundle/web/themes/mandalay/includes/mandalay/imageAttachment.xsl

@@ -43,7 +43,8 @@ Parameter showCaption: boolean to sshow caption
     <xsl:param name="showCaption"/>
     <xsl:param name="maxWidth"/>
     <xsl:param name="maxHeight"/>
-    <xsl:param name="setZoomLink" select="'false'"/>
+    <xsl:param name="setZoomLink" select="'true'"/>
+    <xsl:param name="setTextZoomLink" select="'false'"/>
     <xsl:param name="node" select="./imageAttachments"/>
     <xsl:param name="useContext"/>
     
@@ -55,6 +56,7 @@ Parameter showCaption: boolean to sshow caption
             <xsl:with-param name="maxHeight" select="$maxHeight"/>
             <xsl:with-param name="showCaption" select="$showCaption"/>
             <xsl:with-param name="setZoomLink" select="$setZoomLink"/>
+            <xsl:with-param name="setTextZoomLink" select="$setTextZoomLink"/>
           </xsl:apply-templates>
         </xsl:for-each>
       </xsl:when>
@@ -66,6 +68,7 @@ Parameter showCaption: boolean to sshow caption
             <xsl:with-param name="maxHeight" select="$maxHeight"/>
             <xsl:with-param name="showCaption" select="$showCaption"/>
             <xsl:with-param name="setZoomLink" select="$setZoomLink"/>
+            <xsl:with-param name="setTextZoomLink" select="$setTextZoomLink"/>
           </xsl:apply-templates>
         </xsl:for-each>
       </xsl:otherwise>
@@ -77,6 +80,7 @@ Parameter showCaption: boolean to sshow caption
     <xsl:param name="maxHeight"/>
     <xsl:param name="showCaption"/>
     <xsl:param name="setZoomLink"/>
+    <xsl:param name="setTextZoomLink"/>
     
     <!-- DE Beschränke Bildgröße proportional auf maxWidth und maxHeight -->
     <!-- EN Limiting image size to maxWidth and maxHeight. Keep aspect ratio -->
@@ -85,7 +89,7 @@ Parameter showCaption: boolean to sshow caption
         <xsl:when
           test="$maxWidth != '' and $maxHeight != '' and width > $maxWidth and height > $maxHeight">
           <xsl:if test="$maxWidth div width > $maxHeight div height">
-            <xsl:value-of select="$maxHeight div height * width"/>
+            <xsl:value-of select="round($maxHeight div height * width)"/>
           </xsl:if>
           <xsl:if test="$maxHeight div height >= $maxWidth div width">
             <xsl:value-of select="$maxWidth"/>
@@ -95,7 +99,7 @@ Parameter showCaption: boolean to sshow caption
           <xsl:value-of select="$maxWidth"/>
         </xsl:when>
         <xsl:when test="$maxHeight != '' and height > $maxHeight ">
-          <xsl:value-of select="$maxHeight div height * width"/>
+          <xsl:value-of select="round($maxHeight div height * width)"/>
         </xsl:when>
         <xsl:otherwise>
           <xsl:value-of select="width"/>
@@ -108,7 +112,7 @@ Parameter showCaption: boolean to sshow caption
         <xsl:when
           test="$maxWidth != '' and $maxHeight != '' and width > $maxWidth and height > $maxHeight">
           <xsl:if test="$maxHeight div height > $maxWidth div width">
-            <xsl:value-of select="$maxWidth div width * height"/>
+            <xsl:value-of select="round($maxWidth div width * height)"/>
           </xsl:if>
           <xsl:if test="$maxWidth div width >= $maxHeight div height">
             <xsl:value-of select="$maxHeight"/>
@@ -118,7 +122,7 @@ Parameter showCaption: boolean to sshow caption
           <xsl:value-of select="$maxHeight"/>
         </xsl:when>
         <xsl:when test="$maxWidth != '' and width > $maxWidth ">
-          <xsl:value-of select="$maxWidth div width * height"/>
+          <xsl:value-of select="round($maxWidth div width * height)"/>
         </xsl:when>
         <xsl:otherwise>
           <xsl:value-of select="height"/>
@@ -127,6 +131,8 @@ Parameter showCaption: boolean to sshow caption
     </xsl:variable>
 
     <div class="image">
+    <xsl:choose>
+      <xsl:when test="$setZoomLink = 'true'">
         <a>
           <xsl:attribute name="href">
             <xsl:value-of select="$dispatcher-prefix"/>/cms-service/stream/image/?image_id=<xsl:value-of select="id"/>
@@ -157,7 +163,7 @@ Parameter showCaption: boolean to sshow caption
           </xsl:call-template>
           <img>
             <xsl:attribute name="src">
-            <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/?image_id=<xsl:value-of select="id"/>&amp;maxWidth=<xsl:value-of select="$width"/>&amp;maxHeight=<xsl:value-of select="$height"/>
             </xsl:attribute>
             <xsl:attribute name="alt">
               <xsl:value-of select="../caption"/>
@@ -173,11 +179,33 @@ Parameter showCaption: boolean to sshow caption
             </xsl:attribute>
           </img>
         </a>
+      </xsl:when>
+      <xsl:otherwise>
+        <img>
+          <xsl:attribute name="src">
+            <xsl:value-of select="$dispatcher-prefix"/>/cms-service/stream/image/?image_id=<xsl:value-of select="id"/>&amp;maxWidth=<xsl:value-of select="$width"/>&amp;maxHeight=<xsl:value-of select="$height"/>
+          </xsl:attribute>
+          <xsl:attribute name="alt">
+            <xsl:value-of select="../caption"/>
+          </xsl:attribute>
+          <xsl:attribute name="title">
+            <xsl:value-of select="../caption"/>
+          </xsl:attribute>
+          <xsl:attribute name="width">
+            <xsl:value-of select="$width"/>
+          </xsl:attribute>
+          <xsl:attribute name="height">
+            <xsl:value-of select="$height"/>
+          </xsl:attribute>
+        </img>
+      </xsl:otherwise>
+    </xsl:choose>
+
       <xsl:if
-        test="($showCaption='true' and ../caption) or ($setZoomLink = 'true' and (width != $width or height != $height))">
+        test="($showCaption='true' and ../caption) or ($setTextZoomLink = 'true' and (width != $width or height != $height))">
         <span class="caption" style="width: {$width}px">
           <xsl:choose>
-            <xsl:when test="$setZoomLink = 'true' and (width != $width or height != $height)">
+            <xsl:when test="$setTextZoomLink = 'true' and (width != $width or height != $height)">
               <a>
                 <xsl:attribute name="href">
                   <xsl:value-of select="$dispatcher-prefix"/>/cms-service/stream/image/<xsl:value-of select="name"/>/?image_id=<xsl:value-of select="id"/>

ccm-sci-bundle/web/themes/mandalay/includes/mandalay/languageSelector.xsl

@@ -114,9 +114,15 @@
     <span class="languageEntry">
       <xsl:choose>
         <xsl:when test="$langIter = $negotiated-language">
+          <xsl:attribute name="class">
+            selected languageEntry
+          </xsl:attribute>
           <xsl:value-of select="$localizedLanguageText"/>
         </xsl:when>
         <xsl:otherwise>
+          <xsl:attribute name="class">
+            languageEntry
+          </xsl:attribute>
           <a>
             <xsl:attribute name="href">
               <xsl:choose>

ccm-sci-bundle/web/themes/mandalay/includes/mandalay/lastModified.xsl

@@ -58,14 +58,30 @@
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setShowEditor">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="node"  select="$layoutTree/setShowEditor"/>
+        <xsl:with-param name="module"  select="'lastModified'"/>
+        <xsl:with-param name="setting" select="'setShowEditor'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:variable name="setShowCreator">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="node"  select="$layoutTree/setMailto"/>
+        <xsl:with-param name="node"  select="$layoutTree/setShowCreator"/>
         <xsl:with-param name="module"  select="'lastModified'"/>
         <xsl:with-param name="setting" select="'setShowCreator'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setShowLongDate">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="node"  select="$layoutTree/setShowLongDate"/>
+        <xsl:with-param name="module"  select="'lastModified'"/>
+        <xsl:with-param name="setting" select="'setShowLongDate'"/>
+        <xsl:with-param name="default" select="'false'"/>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:variable name="separator">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="node" select="$layoutTree/separator" />
@@ -84,7 +100,14 @@
           <xsl:with-param name="module" select="'lastModified'"/>
           <xsl:with-param name="id" select="'lastModifiedAt'"/>
         </xsl:call-template>
+        <xsl:choose>
+          <xsl:when test="$setShowLongDate = 'true'">
+            <xsl:value-of select="$resultTree//auditing/lastModifiedDate/@longDate"/>
+          </xsl:when>
+          <xsl:otherwise>
             <xsl:value-of select="$resultTree//auditing/lastModifiedDate/@date"/>
+          </xsl:otherwise>
+        </xsl:choose>
         <xsl:if test="$setDateAndTime = 'true'">
           &nbsp;
           <xsl:value-of select="$resultTree//auditing/lastModifiedDate/@time"/>
@@ -92,13 +115,15 @@
 
         <!-- DE Die erweiterten Angaben nur anzeigen, wenn der User angemeldet ist -->
         <!-- EN Show detailed information only for registered users -->
-        <xsl:if test="not($userName = '')">
+        <xsl:if test="$setShowEditor = 'true' and not($userName = '')">
           <div id="lastModifiedDetails">
             <span id="lastModifiedEditor">
               <xsl:call-template name="mandalay:getStaticText">
                 <xsl:with-param name="module" select="'lastModified'"/>
                 <xsl:with-param name="id" select="'lastModifiedBy'"/>
               </xsl:call-template>
+              <xsl:choose>
+                <xsl:when test="$resultTree//auditing/lastModifiedUser">
                   <xsl:choose>
                     <xsl:when test="$setMailto = 'true'">
                       <a>
@@ -112,6 +137,23 @@
                       <xsl:value-of select="$resultTree//auditing/lastModifiedUser/displayName"/>
                     </xsl:otherwise>
                   </xsl:choose>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:choose>
+                    <xsl:when test="$setMailto = 'true'">
+                      <a>
+                        <xsl:attribute name="href">
+                          <xsl:value-of select="concat('mailto:', $resultTree//auditing/creationUser/primaryEmail)"/>
+                        </xsl:attribute>
+                        <xsl:value-of select="$resultTree//auditing/creationUser/displayName"/>
+                      </a>
+                    </xsl:when>
+                    <xsl:otherwise>
+                      <xsl:value-of select="$resultTree//auditing/creationUser/displayName"/>
+                    </xsl:otherwise>
+                  </xsl:choose>
+                </xsl:otherwise>
+              </xsl:choose>
             </span>
             <xsl:if test="$setShowCreator = 'true' and not($resultTree//auditing/creationUser/id = $resultTree//auditing/lastModifiedUser/id)">
               <xsl:value-of select="$separator"/>

ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl

@@ -51,6 +51,18 @@
       <xsl:attribute name="lang">
         <xsl:value-of select="$lang"/>
       </xsl:attribute>
+      <xsl:attribute name="id">
+        <xsl:choose>
+          <xsl:when test="@application = 'admin' or @application = 'content-center' or @application = 'content-section' 
+                          or @application = 'theme' or @application = 'shortcuts' or @application = 'subsite' or @application = 'terms' or @application = 'atoz' or @application = 'ds'
+                          or @class = 'cms-admin' or @class = 'admin'">
+            <xsl:text>cms</xsl:text>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:text>site</xsl:text>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:attribute>
       <xsl:apply-templates/>
     </html>
   </xsl:template>
@@ -124,6 +136,8 @@
       <!-- EN Load double click protection -->
       <xsl:call-template name="bebop:doubleClickProtection"/>
       
+      <xsl:apply-templates select="$resultTree//script"/>
+
       <!-- DE Setze Favicon, falls vorhanden -->
       <!-- EN Set favicon if exists -->
 <!--      <xsl:if test=""> -->
@@ -318,6 +332,29 @@
     </xsl:choose>
   </xsl:template>
 
+  <xsl:template match="showLeftColumn">
+    <xsl:apply-templates select="$resultTree//bebop:currentPane/bebop:layoutPanel/bebop:left | 
+                                 $resultTree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:left | 
+                                 $resultTree//bebop:currentPane/bebop:boxPanel//bebop:layoutPanel/bebop:left | 
+                                 $resultTree//bebop:currentPane/cms:container/cms:container"/>
+  </xsl:template>
+
+  <xsl:template match="showBodyColumn">
+    <xsl:apply-templates select="$resultTree//bebop:currentPane/bebop:layoutPanel/bebop:body | 
+                                 $resultTree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:body | 
+                                 $resultTree//bebop:currentPane/bebop:boxPanel//bebop:layoutPanel/bebop:body | 
+                                 $resultTree//bebop:currentPane/bebop:layoutPanel/bebop:right | 
+                                 $resultTree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:right | 
+                                 $resultTree//bebop:currentPane/bebop:boxPanel//bebop:layoutPanel/bebop:right | 
+                                 $resultTree//bebop:currentPane/cms:container/*[name() != 'cms:container'] | 
+                                 $resultTree//bebop:currentPane/cms:itemSummary | 
+                                 $resultTree//bebop:currentPane/cms:categorySummary | 
+                                 $resultTree//bebop:currentPane/cms:linkSummary | 
+                                 $resultTree//bebop:currentPane/cms:lifecycleSummary | 
+                                 $resultTree//bebop:currentPane/cms:workflowSummary | 
+                                 $resultTree//bebop:currentPane/cms:transactionSummary"/>
+  </xsl:template>
+
   <xsl:template match="useContent">
     <xsl:choose>
       <xsl:when test="$resultTree/@class = 'cms-admin'">
@@ -356,6 +393,12 @@
       <xsl:when test="$resultTree/@application = 'PublicPersonalProfile'">
         <xsl:apply-templates select="$resultTree//ppp:profile | $resultTree//ppp:profile/personalPublications | $resultTree//ppp:profile/personalProjects | $resultTree//cms:item | $resultTree//bebop:form"/>
       </xsl:when>      
+      <xsl:when test="$resultTree/@application = 'atoz'">
+        <xsl:apply-templates select="$resultTree//atoz:adminPane"/>
+      </xsl:when>
+      <xsl:when test="$resultTree/@application = 'ds'">
+        <xsl:apply-templates select="$resultTree//ui:debugPanel | $resultTree//bebop:boxPanel"/>
+      </xsl:when>
       <xsl:otherwise>
         <xsl:apply-templates select="$resultTree/nav:categoryHierarchy | $resultTree//cms:item | $resultTree//bebop:form"/>
       </xsl:otherwise>
@@ -556,12 +599,24 @@
     </xsl:call-template>
   </xsl:template>
 
+  <xsl:template match="showContentType">
+    <span id="contenttype">
+      <xsl:value-of select="$resultTree/bebop:contentType"/>
+    </span>
+  </xsl:template>
+  
   <xsl:template match="showBebopContextBar">
     <xsl:apply-templates select="$resultTree/bebop:contextBar">
       <xsl:with-param name="layoutTree" select="."/>
     </xsl:apply-templates>
   </xsl:template>
   
+  <xsl:template match="showSystemInformation">
+    <div class="systemInformation">
+      <xsl:apply-templates select="$resultTree/bebop:systemInformation"/>
+    </div>
+  </xsl:template>
+  
   <xsl:template match="showCMSGlobalNavigation">
     <div class="cmsGlobalNavigation">
       <xsl:choose>

ccm-sci-bundle/web/themes/mandalay/includes/mandalay/notes.xsl

@@ -54,9 +54,17 @@
           <xsl:with-param name="default" select="'true'"/>
         </xsl:call-template>
       </xsl:variable>
+      <xsl:variable name="setHeadingPerItem">
+        <xsl:call-template name="mandalay:getSetting">
+          <xsl:with-param name="node"  select="$layoutTree/setHeadingPerItem"/>
+          <xsl:with-param name="module"  select="'notes'"/>
+          <xsl:with-param name="setting" select="'setHeadingPerItem'"/>
+          <xsl:with-param name="default" select="'true'"/>
+        </xsl:call-template>
+      </xsl:variable>
 
       <div class="notes">
-        <xsl:if test="$setHeading='true'">
+        <xsl:if test="$setHeading='true' and $setHeadingPerItem='false'">
           <h2>
             <xsl:call-template name="mandalay:getStaticText">
               <xsl:with-param name="module" select="'notes'"/>
@@ -68,7 +76,17 @@
           <xsl:for-each select="$resultTree//cms:item/ca_notes">
             <xsl:sort data-type="number" select="./rank"/>
             <li>
+              <xsl:if test="$setHeading='true' and $setHeadingPerItem='true'">
+                <h2>
+                  <xsl:call-template name="mandalay:getStaticText">
+                    <xsl:with-param name="module" select="'notes'"/>
+                    <xsl:with-param name="id" select="'heading'"/>
+                  </xsl:call-template>
+                </h2>
+              </xsl:if>
+              <div class="text">
                 <xsl:value-of disable-output-escaping="yes" select="./content"/>
+              </div>
               <div class="endFloat"/>
             </li>
           </xsl:for-each>

ccm-sci-bundle/web/themes/mandalay/includes/mandalay/paginator.xsl

@@ -103,7 +103,7 @@
     <xsl:variable name="pageSize"    select="@pageSize"/>
 
     <xsl:if test="@pageCount &gt; 1">
-      <div id="paginator" class="header">
+      <div class="paginator header">
         <xsl:if test="$setResultInfo = 'true'">
           <xsl:call-template name="mandalay:getStaticText">
             <xsl:with-param name="module" select="'paginator'"/>
@@ -160,8 +160,8 @@
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="node"  select="$layoutTree/separator"/>
         <xsl:with-param name="module"  select="'paginator'"/>
-        <xsl:with-param name="setting" select="'separator'"/>
-        <xsl:with-param name="default" select="' | '"/>
+        <xsl:with-param name="setting" select="'navbar/separator'"/>
+        <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setPageSizeAtNavLinks">
@@ -206,7 +206,7 @@
     </xsl:variable>
 
     <xsl:if test="@pageCount &gt; 1">
-      <div id="paginator" class="navbar">
+      <div class="paginator navbar">
 
         <xsl:variable name="url">
           <xsl:choose>
@@ -238,7 +238,7 @@
         <!-- DE Zurück-Button -->
         <!-- EN back button -->
         <xsl:if test="$pageNumber &gt; 1">
-          <a>
+          <a class="prev">
             <xsl:attribute name="href"><xsl:value-of select="concat($url, $pageParam, '=', $pageNumber - 1)"/></xsl:attribute>
             <xsl:attribute name="accesskey">
               <xsl:call-template name="mandalay:getStaticText">
@@ -270,6 +270,7 @@
         <!-- DE Seitenanzeige -->
         <!-- EN Pagenumber -->
         <xsl:if test="$setPage = 'true'">
+          <span class="pages">
             <xsl:call-template name="mandalay:getStaticText">
               <xsl:with-param name="module" select="'paginator'"/>
               <xsl:with-param name="id" select="'navbar/pageNumber/prefix'"/>
@@ -282,6 +283,7 @@
               </xsl:call-template>
               <xsl:value-of select="$pageCount"/>
             </xsl:if>
+          </span>
         </xsl:if>
   
         <!-- DE Weiter-Button -->
@@ -292,7 +294,7 @@
           <xsl:if test="$setPage = 'true'">
             <xsl:value-of select="$separator"/>
           </xsl:if>
-          <a>
+          <a class="next">
             <xsl:attribute name="href"><xsl:value-of select="concat($url, $pageParam, '=', $pageNumber + 1)"/></xsl:attribute>
             <xsl:attribute name="accesskey">
               <xsl:call-template name="mandalay:getStaticText">
@@ -324,6 +326,7 @@
             </xsl:if>
           </a>
         </xsl:if>
+        <div class="endFloat"/>
       </div>
     </xsl:if>
 

ccm-sci-bundle/web/themes/mandalay/includes/mandalay/quicksearch.xsl

@@ -109,6 +109,7 @@
             </xsl:call-template>
           </xsl:if>
         </label>
+        <div class="quicksearchWrapper">
           <input id="quicksearchbox" class="searchbox" name="terms">
             <xsl:attribute name="alt">
               <xsl:call-template name="mandalay:getStaticText">
@@ -139,8 +140,13 @@
               </xsl:attribute>
             </input>
           </xsl:if>
+        </div>
       </p>
     </form>
-</xsl:template>
+  </xsl:template>
+
+  <xsl:template match="useQuicksearch">
+    <xsl:call-template name="mandalay:quicksearch"/>
+  </xsl:template>
 
 </xsl:stylesheet>

ccm-sci-bundle/web/themes/mandalay/includes/mandalay/relatedLinks.xsl

@@ -63,6 +63,14 @@
           <xsl:with-param name="default" select="'true'"/>
         </xsl:call-template>
       </xsl:variable>
+      <xsl:variable name="setDescriptionAsRichText">
+        <xsl:call-template name="mandalay:getSetting">
+          <xsl:with-param name="node"  select="$layoutTree/setDescriptionAsRichText"/>
+          <xsl:with-param name="module"  select="'relatedLinks'"/>
+          <xsl:with-param name="setting" select="'setDescriptionAsRichText'"/>
+          <xsl:with-param name="default" select="'false'"/>
+        </xsl:call-template>
+      </xsl:variable>
 
       <div class="relatedLinks">
         <xsl:if test="$setHeading='true'">
@@ -82,14 +90,21 @@
                   <xsl:when test="targetType='externalLink'">
                     <!-- DE Extere Links haben keinen Contenttyp, deshalb muß hier eine Sonderbebandlung vorgenommen werden -->
                     <!-- EN -->
-                    <a>
+                    <a class="CIname">
                       <xsl:attribute name="href"><xsl:value-of select="targetURI"/></xsl:attribute>
                       <xsl:attribute name="title"><xsl:value-of select="./linkDescription" /></xsl:attribute>
                       <xsl:value-of disable-output-escaping="yes" select="./linkTitle" />
                     </a>
                     <xsl:if test="./linkDescription">
                       <br />
-                      <xsl:value-of select="./linkDescription" />
+                      <xsl:choose>
+                        <xsl:when test="$setDescriptionAsRichText = 'true'">
+                          <xsl:value-of disable-output-escaping="yes" select="./linkDescription" />
+                        </xsl:when>
+                        <xsl:otherwise>
+                          <xsl:value-of disable-output-escaping="no" select="./linkDescription" />
+                        </xsl:otherwise>
+                      </xsl:choose>
                     </xsl:if>
                   </xsl:when>
                   <xsl:otherwise>

ccm-sci-bundle/web/themes/mandalay/includes/mandalay/script.xsl

@@ -21,11 +21,11 @@
 -->
 
 <!-- DE
-  Hier wird ein Script eingefügt
+  Hier wird ein Menu aus den XML-Settings erzeugt
 -->
 
 <!-- EN
-  Inserts a script
+  Creates a menu from XML-Settings
 -->
 
 <!-- Autor: Sören Bernstein -->
@@ -39,10 +39,11 @@
   exclude-result-prefixes="xsl bebop cms nav mandalay"
   version="1.0">
 
-  <xsl:template match="scipt">
+  <xsl:template match="script">
     <script type="{@type}">
       <xsl:value-of select="."/>
     </script>
   </xsl:template>
 
 </xsl:stylesheet>
+

ccm-sci-bundle/web/themes/mandalay/includes/mandalay/staticLink.xsl

@@ -66,7 +66,7 @@
       <xsl:attribute name="title">
         <xsl:call-template name="mandalay:getStaticText">
           <xsl:with-param name="module" select="$module"/>
-          <xsl:with-param name="id" select="concat('menu/name/', ./name)"/>
+          <xsl:with-param name="id" select="concat('menu/title/', ./title)"/>
         </xsl:call-template>
       </xsl:attribute>
       <xsl:call-template name="mandalay:getStaticText">

ccm-sci-bundle/web/themes/mandalay/includes/mandalay/staticMenu.xsl

@@ -69,13 +69,13 @@
     <xsl:choose>
       <xsl:when test="$mode='horizontal'">
         <xsl:choose>
-          <xsl:when test="./menu or ./useLogin">
-            <xsl:apply-templates select="./menu | ./useLogin" mode="horizontal">
+          <xsl:when test="./menu or ./useLogin or ./useQuicksearch">
+            <xsl:apply-templates select="./menu | ./useLogin | ./useQuicksearch" mode="horizontal">
               <xsl:with-param name="module" select="$module"/>
             </xsl:apply-templates>
           </xsl:when>
           <xsl:otherwise>
-            <xsl:apply-templates select="document(concat($theme-prefix, '/settings/', $module, '.xml'))/settings/menu | document(concat($theme-prefix, '/settings/', $module, '.xml'))/settings/useLogin" mode="horizontal">
+            <xsl:apply-templates select="document(concat($theme-prefix, '/settings/', $module, '.xml'))/settings/menu | document(concat($theme-prefix, '/settings/', $module, '.xml'))/settings/useLogin | document(concat($theme-prefix, '/settings/', $module, '.xml'))/settings/useQuicksearch" mode="horizontal">
               <xsl:with-param name="module" select="$module"/>
             </xsl:apply-templates>
           </xsl:otherwise>
@@ -85,13 +85,13 @@
       <xsl:when test="$mode='vertical'">
         <ul>
           <xsl:choose>
-            <xsl:when test="./menu or ./useLogin">
-              <xsl:apply-templates select="./menu | ./useLogin" mode="vertical">
+            <xsl:when test="./menu or ./useLogin or ./useQuicksearch">
+              <xsl:apply-templates select="./menu | ./useLogin | ./useQuicksearch" mode="vertical">
                 <xsl:with-param name="module" select="$module"/>
               </xsl:apply-templates>
             </xsl:when>
             <xsl:otherwise>
-              <xsl:apply-templates select="document(concat($theme-prefix, '/settings/', $module, '.xml'))/settings/menu | document(concat($theme-prefix, '/settings/', $module, '.xml'))/settings/useLogin" mode="vertical">
+              <xsl:apply-templates select="document(concat($theme-prefix, '/settings/', $module, '.xml'))/settings/menu | document(concat($theme-prefix, '/settings/', $module, '.xml'))/settings/useLogin | document(concat($theme-prefix, '/settings/', $module, '.xml'))/settings/useQuicksearch" mode="vertical">
                 <xsl:with-param name="module" select="$module"/>
               </xsl:apply-templates>
             </xsl:otherwise>
@@ -105,7 +105,7 @@
 
   </xsl:template>
 
-  <xsl:template match="menu | useLogin" mode="horizontal">
+  <xsl:template match="menu | useLogin | useQuicksearch" mode="horizontal">
     <xsl:param name="layoutTree" select="."/>
     <xsl:param name="module"/>
 
@@ -146,7 +146,7 @@
     </xsl:if>
   </xsl:template>
 
-  <xsl:template match="menu | useLogin" mode="vertical">
+  <xsl:template match="menu | useLogin | useQuicksearch" mode="vertical">
     <xsl:param name="module"/>
 
     <xsl:choose>

ccm-sci-bundle/web/themes/mandalay/includes/navigation/breadcrumbs.xsl

@@ -39,6 +39,7 @@
   xmlns:ui="http://www.arsdigita.com/ui/1.0"
   xmlns:mandalay="http://mandalay.quasiweb.de" 
   xmlns:forum="http://www.arsdigita.com/forum/1.0"
+  xmlns:math="java://java.lang.Math"
   exclude-result-prefixes="xsl bebop cms forum nav mandalay"
   version="1.0">
 
@@ -202,14 +203,24 @@
               </span>
 
               <span class="breadHi">
+                <xsl:call-template name="mandalay:breadcrumbText">
+                  <xsl:with-param name="text">
                     <xsl:value-of select="$resultTree//forum:threadDisplay/forum:message/subject"/>
+                  </xsl:with-param>
+                  <xsl:with-param name="mode">mark</xsl:with-param>
+                </xsl:call-template>
               </span>
             </xsl:when>
 
             <!-- DE ContentItem in der Root-Ebene-->
             <xsl:otherwise>
               <span class="breadHi">
+                <xsl:call-template name="mandalay:breadcrumbText">
+                  <xsl:with-param name="text">
                     <xsl:value-of select="$resultTree//cms:contentPanel/cms:item/title"/>
+                  </xsl:with-param>
+                  <xsl:with-param name="mode">mark</xsl:with-param>
+                </xsl:call-template>
               </span>
             </xsl:otherwise>
 
@@ -248,12 +259,17 @@
                   <!-- EN If indexpage, stop list here -->
                   <xsl:when test="$resultTree/bebop:title = 'Navigation' or $resultTree/@application = 'PublicPersonalProfile'">
                     <span class="breadHi">
+                      <xsl:call-template name="mandalay:breadcrumbText">
+                        <xsl:with-param name="text">
                           <xsl:call-template name="mandalay:shying">
                             <xsl:with-param name="title">
                               <xsl:value-of select="@title"/>
                             </xsl:with-param>
                             <xsl:with-param name="mode">dynamic</xsl:with-param>
                           </xsl:call-template>
+                        </xsl:with-param>
+                        <xsl:with-param name="mode">mark</xsl:with-param>
+                      </xsl:call-template>
                     </span>
                   </xsl:when>
 
@@ -275,7 +291,6 @@
                       </xsl:attribute>
                       <xsl:call-template name="mandalay:breadcrumbText">
                         <xsl:with-param name="text">
-
                           <xsl:call-template name="mandalay:shying">
                             <xsl:with-param name="title">
                               <xsl:value-of select="@title"/>
@@ -283,36 +298,26 @@
                             <xsl:with-param name="mode">dynamic</xsl:with-param>
                           </xsl:call-template>
                         </xsl:with-param>
+                        <xsl:with-param name="mode">mark</xsl:with-param>
                       </xsl:call-template>
                     </a>
                     <span class="breadArrow">
                       <xsl:value-of select="$separator"/>
                     </span>
                     <span class="breadHi">
-<!--
-                      <xsl:call-template name="mandalay:breadcrumbText">
-                        <xsl:with-param name="text">
--->
-                      <xsl:call-template name="mandalay:shying">
-                        <xsl:with-param name="title">
                       <!-- DE Kürze letzten Eintrag beim ersten Satzzeichen -->
                       <!-- EN Cut last entry to first occurrence of a punctuation mark -->
-<!--                          <xsl:value-of select="substring-before(substring-before(substring-before(substring-before(substring-before(substring-before($resultTree//cms:contentPanel/cms:item/title, '.'), '?'), '!'). ':'), '-'), ';')"/> -->
-                          <xsl:choose>
-                            <xsl:when test="string-length(substring-before($resultTree//cms:contentPanel/cms:item/title, '.')) > 10">
-                              <xsl:value-of select="substring-before($resultTree//cms:contentPanel/cms:item/title, '.')"/>
-                            </xsl:when>
-                            <xsl:otherwise>
+                      <xsl:call-template name="mandalay:breadcrumbText">
+                        <xsl:with-param name="text">
+                          <xsl:call-template name="mandalay:shying">
+                            <xsl:with-param name="title">
                               <xsl:value-of select="$resultTree//cms:contentPanel/cms:item/title"/>
-                            </xsl:otherwise>
-                          </xsl:choose>
                             </xsl:with-param>
                             <xsl:with-param name="mode">dynamic</xsl:with-param>
                           </xsl:call-template>
-<!--  
                         </xsl:with-param>
+                        <xsl:with-param name="mode">mark</xsl:with-param>
                       </xsl:call-template>
--->
                     </span>
                   </xsl:otherwise>
                 </xsl:choose>
@@ -327,7 +332,7 @@
 
   <xsl:template name="mandalay:breadcrumbText">
     <xsl:param name="layoutTree" select="."/>
-    
+    <xsl:param name="mode" select="'center'"/> <!-- mark, center, end -->
     <xsl:param name="text"/>
     
     <xsl:variable name="limit">
@@ -351,6 +356,95 @@
       <xsl:value-of select="string-length($text)"/>
     </xsl:variable>
 
+    <xsl:choose>    
+      <!-- DE Kürze Text am ersten Satzzeichen -->
+      <!-- EN Shorten text at first punctiation mark -->
+      <xsl:when test="$mode = 'mark'">
+        <xsl:choose>
+          <xsl:when test="$length > 2 * $limit">
+            <xsl:variable name="mark_dot">
+              <xsl:choose>
+                <xsl:when test="contains($text, '.')">
+                  <xsl:value-of select="string-length(substring-before($text, '.'))"/>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:value-of select="$length"/>
+                </xsl:otherwise>
+              </xsl:choose>
+            </xsl:variable>
+            <xsl:variable name="mark_quest">
+              <xsl:choose>
+                <xsl:when test="contains($text, '?')">
+                  <xsl:value-of select="string-length(substring-before($text, '?'))"/>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:value-of select="$length"/>
+                </xsl:otherwise>
+              </xsl:choose>
+            </xsl:variable>
+            <xsl:variable name="mark_exclam">
+              <xsl:choose>
+                <xsl:when test="contains($text, '!')">
+                  <xsl:value-of select="string-length(substring-before($text, '!'))"/>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:value-of select="$length"/>
+                </xsl:otherwise>
+              </xsl:choose>
+            </xsl:variable>
+            <xsl:variable name="mark_dash">
+              <xsl:choose>
+                <xsl:when test="contains($text, ' - ')">
+                  <xsl:value-of select="string-length(substring-before($text, ' - '))"/>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:value-of select="$length"/>
+                </xsl:otherwise>
+              </xsl:choose>
+            </xsl:variable>
+            <xsl:variable name="mark_longdash">
+              <xsl:choose>
+                <xsl:when test="contains($text, ' – ')">
+                  <xsl:value-of select="string-length(substring-before($text, ' – '))"/>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:value-of select="$length"/>
+                </xsl:otherwise>
+              </xsl:choose>
+            </xsl:variable>
+            <xsl:variable name="mark_colon">
+              <xsl:choose>
+                <xsl:when test="contains($text, ': ')">
+                  <xsl:value-of select="string-length(substring-before($text, ': '))"/>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:value-of select="$length"/>
+                </xsl:otherwise>
+              </xsl:choose>
+            </xsl:variable>
+            
+            <xsl:variable name="mark">
+              <xsl:value-of select="math:min(math:min(math:min(math:min(math:min($mark_dot, $mark_quest), $mark_exclam), $mark_dash), $mark_longdash), $mark_colon)"/>
+            </xsl:variable>
+            <xsl:choose>
+              <xsl:when test="$mark &lt; 2 * $limit">
+                <xsl:value-of select="substring($text, 1, $mark)"/>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:value-of select="concat(substring($text, 1, (2 * $limit) - 3), '...')"/>
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:when>
+          <!-- DE Text muß micht gekürzt werden -->
+          <!-- EN No need to shorten the text -->
+          <xsl:otherwise>
+            <xsl:value-of select="$text"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:when>
+      <!-- DE Kürze Text in der Mitte der Zeile -->
+      <!-- EN Shorten text in the middle of the line -->
+      <xsl:when test="$mode = 'center'">
         <xsl:choose>
           <!-- DE Text muß auf length - minOmit gekürzt werden -->
           <!-- EN Shorten text to length - minOmit -->
@@ -378,6 +472,29 @@
             <xsl:value-of select="$text"/>
           </xsl:otherwise>
         </xsl:choose>
+      </xsl:when>
+      <!-- DE Kürze Text am Ende der Zeile -->
+      <!-- EN Shorten text at the end of the line -->
+      <xsl:otherwise>
+        <xsl:choose>
+          <!-- DE Text muß auf length - minOmit gekürzt werden -->
+          <!-- EN Shorten text to length - minOmit -->
+          <xsl:when test="($length > $limit) and ($length - $limit &lt; $minOmit)">
+            <xsl:value-of select="substring($text, 1, $length - $minOmit)"/>
+          </xsl:when>
+          <!-- DE Text muß auf limit gekürzt werden -->
+          <!-- EN Shorten text to limit-->
+          <xsl:when test="$length - $limit > $minOmit">
+            <xsl:value-of select="substring($text, 1, $limit)"/>
+          </xsl:when>
+          <!-- DE Text muß micht gekürzt werden -->
+          <!-- EN No need to shorten the text -->
+          <xsl:otherwise>
+            <xsl:value-of select="$text"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:otherwise>
+    </xsl:choose>
     
   </xsl:template>
 

ccm-sci-bundle/web/themes/mandalay/includes/navigation/navigation.xsl

@@ -52,6 +52,14 @@
 
     <!-- DE Hole alle benötigten Einstellungen-->
     <!-- EN Getting all needed setting-->
+    <xsl:variable name="useNavID">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="node" select="$layoutTree/useNavID"/>
+        <xsl:with-param name="module" select="'navigation'"/>
+        <xsl:with-param name="setting" select="'menu/useNavID'"/>
+        <xsl:with-param name="default" select="'categoryMenu'"/>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:variable name="withColorset">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="node" select="$layoutTree/withColorset"/>
@@ -109,7 +117,7 @@
     <!-- EN Building menu -->
     <xsl:choose>
       <xsl:when test="$setFirstLevelMode = 'horizontal'">
-        <xsl:apply-templates select="$resultTree/nav:categoryMenu/nav:category" mode="horizontal">
+        <xsl:apply-templates select="$resultTree/nav:categoryMenu[@id=$useNavID]/nav:category" mode="horizontal">
           <xsl:with-param name="level" select="0"/>
           <xsl:with-param name="csNum" select="0"/>
           <xsl:with-param name="minLevel" select="$setMinLevel"/>
@@ -120,8 +128,8 @@
         </xsl:apply-templates>
       </xsl:when>
       <xsl:otherwise>
-        <ul>
-          <xsl:apply-templates select="$resultTree/nav:categoryMenu/nav:category" mode="vertical">
+        <ul class="navigation">
+          <xsl:apply-templates select="$resultTree/nav:categoryMenu[@id=$useNavID]/nav:category" mode="vertical">
             <xsl:with-param name="level" select="0"/>
             <xsl:with-param name="csNum" select="0"/>
             <xsl:with-param name="minLevel" select="$setMinLevel"/>
@@ -184,7 +192,7 @@
 
     <!-- DE Erzeuge das Menu aus den übergebenen Daten -->
     <!-- EN Building menu -->
-    <ul>
+    <ul class="sitemap">
       <xsl:apply-templates select="$resultTree/nav:categoryHierarchy/nav:category" mode="vertical">
         <xsl:with-param name="level" select="1"/>
         <xsl:with-param name="csNum" select="0"/>

ccm-sci-bundle/web/themes/mandalay/includes/navigation/objectList.xsl

@@ -188,12 +188,46 @@
 
   <!-- DE Verarbeite die ObjectList -->
   <xsl:template match="nav:objectList">
+    <xsl:variable name="useEditLinks">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module" select="'objectList'"/>
+        <xsl:with-param name="setting" select="'useEditLinks'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+  
     <ul>
+      <xsl:if test="../@customName">
+        <xsl:attribute name="class">
+          <xsl:value-of select="../@customName"/>
+        </xsl:attribute>
+      </xsl:if>
+      <xsl:for-each select="nav:section">
+        <xsl:sort select="./@sortKey" data-type="number"/>
+      	<li>
+	  <h2><xsl:value-of select="./@title"/></h2>
+	  <ul>
+	    <xsl:for-each select="nav:item">
+	      <li>
+	        <xsl:apply-templates select="." mode="list_view" />
+		    <div class="endFloat"/>
+	      </li>
+	    </xsl:for-each>
+	  </ul>
+	</li>
+      </xsl:for-each>
+
       <xsl:for-each select="nav:item">
         <li>
           <!-- DE Ruft die Templates aus den ContentTypen auf (Listenansicht) -->
           <!-- EN Calling template from contenttype (listview) -->
           <xsl:apply-templates select="." mode="list_view"/>
+          <xsl:if test="($useEditLinks = 'true') and ./editLink">
+            <xsl:call-template name="mandalay:itemEditLink">
+              <xsl:with-param name="editUrl" select="./editLink"/>
+              <xsl:with-param name="itemTitle" select="./title"/>
+            </xsl:call-template>
+          </xsl:if>
           <div class="endFloat"/>
         </li>
       </xsl:for-each>

ccm-sci-bundle/web/themes/mandalay/includes/portal/sitemap.xsl

@@ -81,7 +81,7 @@
         <a>
           <xsl:attribute name="href">
             <xsl:call-template name="mandalay:linkParser">
-              <xsl:with-param name="link" select="primaryURL"/>
+              <xsl:with-param name="link" select="@primaryURL"/>
             </xsl:call-template>
           </xsl:attribute>
           <xsl:attribute name="title">

ccm-sci-bundle/web/themes/mandalay/includes/portlet.xsl

@@ -51,6 +51,7 @@
   <xsl:import href="portlet/flash.xsl"/>
   <xsl:import href="portlet/freeformHTML.xsl"/>
   <xsl:import href="portlet/login.xsl"/>
+  <xsl:import href="portlet/myForums.xsl"/>
   <xsl:import href="portlet/rssFeed.xsl"/>
   <xsl:import href="portlet/recentPostings.xsl"/>
   <xsl:import href="portlet/taskList.xsl"/>

ccm-sci-bundle/web/themes/mandalay/includes/portlet/myForums.xsl

@@ -0,0 +1,84 @@
+<?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 das Portlet RecentPostings verarbeitet 
+-->
+
+<!-- EN
+  Processing portlets recentPostings
+-->
+
+<!-- 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" 
+  xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
+  xmlns:portlet="http://www.uk.arsdigita.com/portlet/1.0"
+  xmlns:forum="http://www.arsdigita.com/forum/1.0"
+  exclude-result-prefixes="xsl bebop cms nav mandalay portal portlet forum"
+  version="1.0">
+
+  <xsl:template match="forum:myForumsPortlet" mode="setHeading">
+    <xsl:variable name="setHeading">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module" select="'portletRecentPostings'"/>
+        <xsl:with-param name="setting" select="'setHeading'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    
+    <xsl:value-of select="$setHeading"/>
+  </xsl:template>
+  
+  <xsl:template match="forum:myForumsPortlet">
+    <div class="myForums">
+      <xsl:apply-templates/>
+    </div>
+  </xsl:template>
+
+  <xsl:template match="forum:forumShortcut">
+    <div class="forum">
+      <div class="forumLastUpdate startLeftFloat">
+        <xsl:value-of select="@lastUpdated"/>
+      </div>
+      <div class="forumTitle addLeftFloat">
+        <a>
+          <xsl:attribute name="href">
+            <xsl:call-template name="mandalay:linkParser">
+              <xsl:with-param name="link" select="@url"/>
+            </xsl:call-template>
+          </xsl:attribute>
+          <xsl:attribute name="title">
+            <xsl:value-of select="@title"/>
+          </xsl:attribute>
+          <xsl:value-of select="@title"/>
+        </a>
+      </div>
+    </div>
+  </xsl:template>
+
+</xsl:stylesheet>

ccm-sci-bundle/web/themes/mandalay/includes/portlet/recentPostings.xsl

@@ -42,7 +42,7 @@
   exclude-result-prefixes="xsl bebop cms nav mandalay portal portlet forum"
   version="1.0">
 
-  <xsl:template match="portlet:recentPostings" mode="setHeading">
+  <xsl:template match="forum:recentPostingsPortlet" mode="setHeading">
     <xsl:variable name="setHeading">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module" select="'portletRecentPostings'"/>
@@ -56,7 +56,17 @@
   
   <xsl:template match="forum:recentPostingsPortlet">
     <div class="recentPostings">
+      <xsl:choose>
+        <xsl:when test="./*">
           <xsl:apply-templates/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:call-template name="mandalay:getStaticText">
+            <xsl:with-param name="module" select="'portlet'"/>
+            <xsl:with-param name="id" select="'recentPostings/none'"/>
+          </xsl:call-template>
+        </xsl:otherwise>
+      </xsl:choose>
     </div>
   </xsl:template>
 

ccm-sci-bundle/web/themes/mandalay/includes/portlet/rssFeed.xsl

@@ -44,7 +44,7 @@
   exclude-result-prefixes="xsl bebop cms nav mandalay portal portlet rdf rss"
   version="1.0">
 
-  <xsl:template match="portlet:rssFeed" mode="setHeading">
+  <xsl:template match="portlet:RSSFeed" mode="setHeading">
     <xsl:variable name="setHeading">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module" select="'portletRssFeed'"/>
@@ -70,61 +70,55 @@
         <xsl:with-param name="default" select="'10'"/>
       </xsl:call-template>
     </xsl:param>
-    <xsl:apply-templates select="rss:channel"/>
-    <xsl:for-each select="rss:item[position() &lt; $maxItems]">
+    <xsl:apply-templates select="channel"/>
+    <xsl:for-each select="item[position() &lt; $maxItems]">
       <dl>
         <xsl:apply-templates select="."/>
       </dl>
     </xsl:for-each>
   </xsl:template>
   
-  <xsl:template match="rss:rss">
-    <xsl:param name="maxItems">
+  <xsl:template match="rss">
+    <xsl:variable name="maxItems">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module" select="'portletRssFeed'"/>
         <xsl:with-param name="setting" select="'setMaxItems'"/>
         <xsl:with-param name="default" select="'10'"/>
       </xsl:call-template>
-    </xsl:param>
-    <xsl:apply-templates select="rss:channel">
+    </xsl:variable>
+    <xsl:apply-templates select="channel">
       <xsl:with-param name="maxItems" select="$maxItems"/>
     </xsl:apply-templates>
   </xsl:template>
   
-  <xsl:template match="rss:channel">
-    <xsl:param name="maxItems">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'portletRssFeed'"/>
-        <xsl:with-param name="setting" select="'setMaxItems'"/>
-        <xsl:with-param name="default" select="'10'"/>
-      </xsl:call-template>
-    </xsl:param>
+  <xsl:template match="channel">
+    <xsl:param name="maxItems"/>
     <a>
       <xsl:attribute name="href">
-        <xsl:value-of select="rss:link"/>
+        <xsl:value-of select="link"/>
       </xsl:attribute>
-      <xsl:value-of select="rss:title"/>
+      <xsl:value-of select="title"/>
     </a>
     <!-- DE Rückwärtskompatibilität mit altem RSS Format -->
     <!-- EN Backwards compatibility with old RSS format -->
-    <xsl:for-each select="rss:item[position() &lt; $maxItems]">
     <dl>
+      <xsl:for-each select="item[position() &lt; $maxItems]">
         <xsl:apply-templates select="."/>
-      </dl>
       </xsl:for-each>
+    </dl>
   </xsl:template>
   
-  <xsl:template match="rss:item">
+  <xsl:template match="item">
     <dt>
       <a>
         <xsl:attribute name="href">
-          <xsl:value-of select="rss:link"/>
+          <xsl:value-of select="link"/>
         </xsl:attribute>
-        <xsl:value-of select="rss:title"/>
+        <xsl:value-of select="title"/>
       </a>
     </dt>
     <dd>
-      <xsl:value-of select="rss:description"/>
+      <xsl:value-of select="description"/>
     </dd>
   </xsl:template>
   

ccm-sci-bundle/web/themes/mandalay/includes/search/filterControls.xsl

@@ -63,7 +63,7 @@
 	</xsl:call-template>	
       </legend>
       <xsl:call-template name="filterControlsFilters"/>
-      <input type="submit">
+      <input type="submit" class="submit">
 	<xsl:attribute name="value">
 	  <xsl:call-template name="mandalay:getStaticText">
 	    <xsl:with-param name="module" select="'filterControls'"/>
@@ -86,7 +86,7 @@
 	  </xsl:call-template>	
 	</legend>
 	<xsl:call-template name="filterControlsSortFields"/>
-	<input type="submit">
+	<input type="submit" class="submit">
 	  <xsl:attribute name="value">
 	    <xsl:call-template name="mandalay:getStaticText">
 	      <xsl:with-param name="module" select="'filterControls'"/>
@@ -183,7 +183,11 @@
   <xsl:template name="filterControlsSortFields">
    <!-- <xsl:if test="count(./controls/sortFields/sortField) &gt; 1">-->
 <!--   <code>sortFields</code>-->
-      <label for="selectSortBy">	
+     <span>
+      <label>	
+        <xsl:attribute name="for">
+	  <xsl:value-of select="concat(../../@customName, 'SortBy')"/>
+	</xsl:attribute>
 	<xsl:call-template name="mandalay:getStaticText">
 	  <xsl:with-param name="module" select="'filterControls'"/>
 	  <xsl:with-param name="id" select="concat(./@customName, 'SortBy')"/>
@@ -208,6 +212,7 @@
 	  </xsl:for-each>
 	</xsl:for-each>
       </select>
+    </span>
    <!-- </xsl:if> -->
   </xsl:template>
 

ccm-sci-bundle/web/themes/mandalay/includes/search/searchQuery.xsl

@@ -69,6 +69,7 @@
       #resultList .result {display: table-row; }
       #resultList .result span {display: table-cell; padding-bottom: 0.7em; padding-right: 1em; }
       #resultList .result.even {background-color: #f6f6f6;}
+<!--
       #search {display: table;}
       #search .query {display: table-cell; text-align: right; vertical-align: top; font-weight: bold; padding-right: 1em;}
       #search fieldset {display: table-row;}
@@ -76,6 +77,7 @@
       #search .filter {display: table-row;}
       #search .filterName {display: table-cell; text-align: right; vertical-align: top; font-weight: bold; padding-right: 1em;}
       #search .filterParam {display: table-cell; padding-bottom: 1.2em;}
+-->
       <xsl:choose>
         <xsl:when test="'false'">
         </xsl:when>

ccm-sci-bundle/web/themes/mandalay/includes/types/Address.xsl

@@ -251,7 +251,7 @@
     <!-- DE Wenn es Bilder gibt, dann soll das erste hier als Link angezeigt werden -->
     <!-- EN -->
     <xsl:if test="./targetItem/imageAttachments and $setImage = 'true'">
-      <a>
+      <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">
@@ -271,7 +271,7 @@
       </a>
     </xsl:if>
     <xsl:if test="$setImageAndText = 'true' or not(./targetItem/imageAttachments) or $setImage = 'false'">
-      <a>
+      <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">

ccm-sci-bundle/web/themes/mandalay/includes/types/Article.xsl

@@ -134,6 +134,30 @@ Article content type
       </xsl:call-template>
     </xsl:variable>
 
+    <xsl:if test="nav:attribute[@name='imageAttachments.image.id']">
+      <a>
+        <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
+        <xsl:attribute name="title">
+          <xsl:call-template name="mandalay:shying">
+            <xsl:with-param name="title">
+              <xsl:value-of select="nav:attribute[@name='title']"/>
+            </xsl:with-param>
+            <xsl:with-param name="mode">dynamic</xsl:with-param>
+          </xsl:call-template>
+        </xsl:attribute>
+
+        <div class="image">
+          <img>
+            <xsl:attribute name="src">/ccm/cms-service/stream/image/?image_id=<xsl:value-of select="nav:attribute[@name='imageAttachments.image.id']"/>&amp;maxWidth=150&amp;maxHeight=100</xsl:attribute>
+            <xsl:if test="nav:attribute[@name='imageAttachments.caption']">
+              <xsl:attribute name="alt"><xsl:value-of select="nav:attribute[@name='imageAttachments.caption']"/></xsl:attribute>
+              <xsl:attribute name="title"><xsl:value-of select="nav:attribute[@name='imageAttachments.caption']"/></xsl:attribute>
+            </xsl:if>
+          </img>
+        </div>
+      </a>
+    </xsl:if>
+
     <a class="CIname">
       <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
       <xsl:attribute name="title">
@@ -151,6 +175,7 @@ Article content type
         <xsl:with-param name="mode">dynamic</xsl:with-param>
       </xsl:call-template>
     </a>
+
     <xsl:if test="nav:attribute[@name='lead'] and $setLeadText = 'true'">
       <br />
       <span class="intro">
@@ -184,6 +209,7 @@ Article content type
         </xsl:choose>
       </span>
     </xsl:if>
+
   </xsl:template>
 
   <xsl:template name="CT_Article_Link" match="*/cms:item/links[targetItem/objectType = 'com.arsdigita.cms.contenttypes.Article']" mode="link_view">
@@ -250,7 +276,7 @@ Article content type
     <!-- DE Wenn es Bilder gibt, dann soll das erste hier als Link angezeigt werden -->
     <!-- EN -->
     <xsl:if test="./targetItem/imageAttachments and $setImage = 'true'">
-      <a>
+      <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">
@@ -265,12 +291,13 @@ Article content type
             <xsl:with-param name="showCaption" select="$setImageCaption" />
             <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
             <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+            <xsl:with-param name="setZoomLink" select="'false'" />
           </xsl:call-template>
         </xsl:for-each>
       </a>
     </xsl:if>
     <xsl:if test="$setImageAndText = 'true' or not(./targetItem/imageAttachments) or $setImage = 'false'">
-      <a>
+      <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">

ccm-sci-bundle/web/themes/mandalay/includes/types/Bookmark.xsl

@@ -88,7 +88,9 @@
 
     <div id="mainBody">
       <xsl:value-of disable-output-escaping="yes" select="./textAsset/content"/>
-      <a>
+    </div>
+    <div class="bookmarkAction">
+      <a class="bookmark">
         <xsl:attribute name="href">
           <xsl:value-of select="./url"/>
         </xsl:attribute>
@@ -289,7 +291,7 @@
     <xsl:if test="./targetItem/imageAttachments and $setImage = 'true'">
       <xsl:choose>
         <xsl:when test="$setLinkToDetails = 'true' or (string-length(./linkDescription) > $setDescriptionLength and $setDescriptionLength != '0')">
-          <a>
+          <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">
@@ -309,7 +311,7 @@
           </a>
         </xsl:when>
         <xsl:otherwise>
-          <a>
+          <a class="CIname">
             <xsl:attribute name="href"><xsl:value-of select="./targetItem/url"/></xsl:attribute>
             <xsl:attribute name="title">
               <xsl:call-template name="mandalay:shying">

ccm-sci-bundle/web/themes/mandalay/includes/types/Contact.xsl

@@ -309,7 +309,7 @@
     <!-- DE Wenn es Bilder gibt, dann soll das erste hier als Link angezeigt werden -->
     <!-- EN -->
     <xsl:if test="./targetItem/imageAttachments and $setImage = 'true'">
-      <a>
+      <a class="CIname">
         <xsl:attribute name="href">
           <xsl:text>/redirect/?oid=</xsl:text>
           <xsl:value-of select="./targetItem/@oid"/>
@@ -333,7 +333,7 @@
     </xsl:if>
     <xsl:if
       test="$setImageAndText = 'true' or not(./targetItem/imageAttachments) or $setImage = 'false'">
-      <a>
+      <a class="CIname">
         <xsl:attribute name="href">
           <xsl:text>/redirect/?oid=</xsl:text>
           <xsl:value-of select="./targetItem/@oid"/>
@@ -427,6 +427,7 @@
   <xsl:param name="setGender" select="'false'"/>
   <xsl:param name="setBirthdate" select="'false'"/>
   <xsl:param name="setAddressHeader" select="'true'"/>
+  <xsl:param name="setAddress" select="'true'"/>
   <xsl:param name="setShowKeys" select="'true'"/>
   <xsl:param name="setContactEntriesHeader" select="'true'"/>
   
@@ -439,6 +440,7 @@
     </xsl:call-template>
   </xsl:for-each>
   
+  <xsl:if test="$setAddress = 'true'">
   <xsl:for-each select="address">
     <xsl:if test="$setAddressHeader = 'true'">
       <h3>
@@ -452,6 +454,7 @@
       <xsl:with-param name="setShowKeys" select="$setShowKeys"/>
     </xsl:call-template>
   </xsl:for-each>
+  </xsl:if>
   
   <xsl:if test="contactentries">
     <xsl:if test="$setContactEntriesHeader">

ccm-sci-bundle/web/themes/mandalay/includes/types/Event.xsl

@@ -105,6 +105,13 @@
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setEventDate">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'Event'"/>
+        <xsl:with-param name="setting" select="'setEventDate'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:variable name="setEventType">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'Event'"/>
@@ -150,9 +157,9 @@
     </xsl:if>
 
     <div id="mainBody">
-      <div id="details">
+      <div class="details table">
         <xsl:if test="./location and $setLocation = 'true'">
-          <div id="location">
+          <div class="location tableRow">
             <span class="key">
               <xsl:call-template name="mandalay:getStaticText">
                 <xsl:with-param name="module" select="'Event'" />
@@ -168,7 +175,7 @@
         <xsl:choose>
           <xsl:when test="not(./endDate) or ./startDate = ./endDate">
             <!-- Zeige nur das StartDate an -->
-            <p>
+            <div class="date tableRow">
               <span class="key">
                 <xsl:call-template name="mandalay:getStaticText">
                   <xsl:with-param name="module" select="'Event'" />
@@ -176,7 +183,14 @@
                 </xsl:call-template>
               </span>
               <span class="value">
+                <xsl:choose>
+                  <xsl:when test="$setDateFormat = 'L'">
+                    <xsl:value-of disable-output-escaping="yes" select="./startDate/@longDate"/>
+                  </xsl:when>
+                  <xsl:otherwise>
                     <xsl:value-of disable-output-escaping="yes" select="./startDate/@date"/>
+                  </xsl:otherwise>
+                </xsl:choose>
                 <xsl:if test="./startTime/@time and ./endTime/@time and not(./startTime/@time = ./endTime/@time)">
                   <xsl:value-of select="$dateSeparator"/>
                   <xsl:value-of disable-output-escaping="yes" select="./startTime/@time"/>
@@ -188,10 +202,10 @@
                   </xsl:call-template>
                 </xsl:if>
               </span>
-            </p>
+            </div>
             <xsl:if test="not(./endTime/@time) or ./startTime/@time = ./endTime/@time">
               <!-- Zeige nur die StartTime an-->
-              <p>
+              <div class="time tableRow">
                 <span class="key">
                   <xsl:call-template name="mandalay:getStaticText">
                     <xsl:with-param name="module" select="'Event'" />
@@ -201,12 +215,12 @@
                 <span class="value">
                   <xsl:value-of disable-output-escaping="yes" select="./startTime/@time"/>
                 </span>
-              </p>
+              </div>
             </xsl:if>
           </xsl:when>
 
           <xsl:otherwise>
-            <p>
+            <div class="datetime tableRow">
               <span class="key">
                 <xsl:call-template name="mandalay:getStaticText">
                   <xsl:with-param name="module" select="'Event'" />
@@ -214,7 +228,14 @@
                 </xsl:call-template>
               </span>
               <span class="value">
+                <xsl:choose>
+                  <xsl:when test="$setDateFormat = 'L'">
+                    <xsl:value-of disable-output-escaping="yes" select="./startDate/@longDate"/>
+                  </xsl:when>
+                  <xsl:otherwise>
                     <xsl:value-of disable-output-escaping="yes" select="./startDate/@date"/>
+                  </xsl:otherwise>
+                </xsl:choose>
                 <xsl:if test="./startTime">
                   <xsl:call-template name="mandalay:getStaticText">
                     <xsl:with-param name="module" select="'Event'" />
@@ -227,8 +248,8 @@
                   </xsl:call-template>
                 </xsl:if>
               </span>
-            </p>
-            <p>
+            </div>
+            <div class="endTime tableRow">
               <span class="key">
                 <xsl:call-template name="mandalay:getStaticText">
                   <xsl:with-param name="module" select="'Event'" />
@@ -236,7 +257,14 @@
                 </xsl:call-template>
               </span>
               <span class="value">
+                <xsl:choose>
+                  <xsl:when test="$setDateFormat = 'L'">
+                    <xsl:value-of disable-output-escaping="yes" select="./endDate/@longDate"/>
+                  </xsl:when>
+                  <xsl:otherwise>
                     <xsl:value-of disable-output-escaping="yes" select="./endDate/@date"/>
+                  </xsl:otherwise>
+                </xsl:choose>
                 <xsl:if test="./endTime">
                   <xsl:call-template name="mandalay:getStaticText">
                     <xsl:with-param name="module" select="'Event'" />
@@ -249,12 +277,12 @@
                   </xsl:call-template>
                 </xsl:if>
               </span>
-            </p>
+            </div>
           </xsl:otherwise>
         </xsl:choose>
 
-        <xsl:if test="./eventDate and $setDate = 'true'">
-          <p>
+        <xsl:if test="./eventDate and $setEventDate = 'true'">
+          <div class="eventDate tableRow">
             <span class="key">
               <xsl:call-template name="mandalay:getStaticText">
                 <xsl:with-param name="module" select="'Event'" />
@@ -264,11 +292,11 @@
             <span class="value">
               <xsl:value-of disable-output-escaping="yes" select="./eventDate"/>
             </span>
-          </p>
+          </div>
         </xsl:if>
 
         <xsl:if test="./eventType and $setEventType = 'true'">
-          <p>
+          <div class="eventType tableRow">
             <span class="key">
               <xsl:call-template name="mandalay:getStaticText">
                 <xsl:with-param name="module" select="'Event'" />
@@ -278,11 +306,11 @@
             <span class="value">
               <xsl:value-of disable-output-escaping="yes" select="./eventType"/>
             </span>
-          </p>
+          </div>
         </xsl:if>
 
         <xsl:if test="./mainContributor and $setMainContributor = 'true'">
-          <p>
+          <div class="mainContributor tableRow">
             <span class="key">
               <xsl:call-template name="mandalay:getStaticText">
                 <xsl:with-param name="module" select="'Event'" />
@@ -292,11 +320,11 @@
             <div class="value">
               <xsl:value-of disable-output-escaping="yes" select="./mainContributor"/>
             </div>
-          </p>
+          </div>
         </xsl:if>
 
         <xsl:if test="./cost and $setCost = 'true'">
-          <p>
+          <div class="cost tableRow">
             <span class="key">
               <xsl:call-template name="mandalay:getStaticText">
                 <xsl:with-param name="module" select="'Event'" />
@@ -306,10 +334,11 @@
             <span class="value">
               <xsl:value-of disable-output-escaping="yes" select="./cost"/>
             </span>
-          </p>
+          </div>
         </xsl:if>
 
         <xsl:if test="./mapLink and $setMapLink = 'true'">
+          <div class="mapLink tableRow">
             <a>
               <xsl:attribute name="href"><xsl:value-of select="./mapLink"/></xsl:attribute>
               <span class="key">
@@ -319,7 +348,9 @@
                 </xsl:call-template>
               </span>
             </a>
+          </div>
         </xsl:if>
+        <div class="endFloat"/>
       </div>
 
       <xsl:value-of disable-output-escaping="yes" select="./textAsset/content"/>
@@ -390,16 +421,37 @@
         <span class="date">
           <xsl:choose>
             <xsl:when test="not(nav:attribute[@name='endDate']) or nav:attribute[@name='startDate'] = nav:attribute[@name='endDate']">
-              <xsl:value-of select="nav:attribute[@name='startDate']/@date"/>
+                <xsl:choose>
+                  <xsl:when test="$setDateFormat = 'L'">
+                    <xsl:value-of select="nav:attribute[@name='startDate']/@longDate"/>
                   </xsl:when>
                   <xsl:otherwise>
                     <xsl:value-of select="nav:attribute[@name='startDate']/@date"/>
+                  </xsl:otherwise>
+                </xsl:choose>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:choose>
+                  <xsl:when test="$setDateFormat = 'L'">
+                    <xsl:value-of select="nav:attribute[@name='startDate']/@longDate"/>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <xsl:value-of select="nav:attribute[@name='startDate']/@date"/>
+                  </xsl:otherwise>
+                </xsl:choose>
               <span class="separator">
                 <xsl:value-of select="$dateSeparator"/>
               </span>
+                <xsl:choose>
+                  <xsl:when test="$setDateFormat = 'L'">
+                    <xsl:value-of select="nav:attribute[@name='endDate']/@longDate"/>
+                  </xsl:when>
+                  <xsl:otherwise>
                     <xsl:value-of select="nav:attribute[@name='endDate']/@date"/>
                   </xsl:otherwise>
                 </xsl:choose>
+            </xsl:otherwise>
+          </xsl:choose>
         </span>
         <xsl:if test="nav:attribute[@name='eventDate']">
           <xsl:value-of select="$dateSeparator"/>
@@ -530,7 +582,7 @@
     <!-- DE Wenn es Bilder gibt, dann soll das erste hier als Link angezeigt werden -->
     <!-- EN -->
     <xsl:if test="./targetItem/imageAttachments and $setImage = 'true'">
-      <a>
+      <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">
@@ -550,7 +602,7 @@
       </a>
     </xsl:if>
     <xsl:if test="$setImageAndText = 'true' or not(./targetItem/imageAttachments) or $setImage = 'false'">
-      <a>
+      <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">

ccm-sci-bundle/web/themes/mandalay/includes/types/FAQItem.xsl

@@ -260,7 +260,7 @@
     <xsl:if test="./targetItem/imageAttachments and $setImage = 'true'">
       <xsl:choose>
         <xsl:when test="$setLinkToDetails = 'true' or (string-length(./linkDescription) > $setDescriptionLength and $setDescriptionLength != '0')">
-          <a>
+          <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">
@@ -293,7 +293,7 @@
     <xsl:if test="$setImageAndText = 'true' or not(./targetItem/imageAttachments) or $setImage = 'false'">
       <xsl:choose>
         <xsl:when test="$setLinkToDetails = 'true' or (string-length(./linkDescription) > $setDescriptionLength and $setDescriptionLength != '0')">
-          <a>
+          <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">

ccm-sci-bundle/web/themes/mandalay/includes/types/FileStorageItem.xsl

@@ -107,9 +107,9 @@
         </div>
       </xsl:if>
     </div>
-    <div id="fsiAction">
+    <div class="fsiAction">
       <xsl:if test="$setViewLink = 'true'">
-	<a>
+        <a class="show">
           <xsl:attribute name="href">
             <xsl:choose>
               <xsl:when test="$includeFileNameIntoFileLinks = 'true'">
@@ -120,7 +120,7 @@
               </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'"/>
@@ -137,7 +137,7 @@
         <xsl:value-of select="$separator"/>
       </xsl:if>
       <xsl:if test="$setSaveLink = 'true'">
-	<a>
+        <a class="save">
           <xsl:attribute name="href">
             <xsl:choose>
               <xsl:when test="$includeFileNameIntoFileLinks = 'true'">		
@@ -309,7 +309,7 @@
     <!-- DE Wenn es Bilder gibt, dann soll das erste hier als Link angezeigt werden -->
     <!-- EN -->
     <xsl:if test="./targetItem/imageAttachments and $setImage = 'true'">
-      <a>
+      <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">
@@ -329,7 +329,7 @@
       </a>
     </xsl:if>
     <xsl:if test="$setImageAndText = 'true' or not(./targetItem/imageAttachments) or $setImage = 'false'">
-      <a>
+      <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">

ccm-sci-bundle/web/themes/mandalay/includes/types/Form.xsl

@@ -108,6 +108,20 @@
         <xsl:attribute name="name"><xsl:value-of select="./name"/></xsl:attribute>
         <xsl:attribute name="accept-charset">UTF-8</xsl:attribute>
 
+        <xsl:if test="count(./form/component[
+                                (
+                                  objectType != 'com.arsdigita.formbuilder.Widget' and 
+                                  objectType != 'com.arsdigita.formbuilder.DataDrivenSelect'
+                                ) or 
+                                (
+                                  defaultDomainClass = 'com.arsdigita.formbuilder.PersistentSubmit' or
+                                  defaultDomainClass = 'com.arsdigita.formbuilder.PersistentHidden' or
+                                  defaultDomainClass = 'com.arsdigita.formbuilder.HiddenIDGenerator'
+                                )
+                                ]) > 2">
+          <xsl:attribute name="class">multiline</xsl:attribute>
+        </xsl:if>
+
         <xsl:choose>
           <xsl:when test="./remote = 'true'">
             <xsl:attribute name="action"><xsl:value-of select="./remoteUrl"/></xsl:attribute>
@@ -302,7 +316,7 @@
     <!-- DE Wenn es Bilder gibt, dann soll das erste hier als Link angezeigt werden -->
     <!-- EN -->
     <xsl:if test="./targetItem/imageAttachments and $setImage = 'true'">
-      <a>
+      <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">
@@ -322,7 +336,7 @@
       </a>
     </xsl:if>
     <xsl:if test="$setImageAndText = 'true' or not(./targetItem/imageAttachments) or $setImage = 'false'">
-      <a>
+      <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">

ccm-sci-bundle/web/themes/mandalay/includes/types/GenericAddress.xsl

@@ -253,7 +253,7 @@
     <!-- DE Wenn es Bilder gibt, dann soll das erste hier als Link angezeigt werden -->
     <!-- EN -->
     <xsl:if test="./targetItem/imageAttachments and $setImage = 'true'">
-      <a>
+      <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">
@@ -273,7 +273,7 @@
       </a>
     </xsl:if>
     <xsl:if test="$setImageAndText = 'true' or not(./targetItem/imageAttachments) or $setImage = 'false'">
-      <a>
+      <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">
@@ -327,8 +327,13 @@
   <xsl:template name="CT_GenericAddress_details">
     <xsl:param name="setShowKeys" select="'true'"/>
     
+    <div class="details">
+      <xsl:if test="$setShowKeys='true'">
+        <xsl:attribute name="class">details tableRow</xsl:attribute>
+      </xsl:if>
       <div>
         <xsl:if test="$setShowKeys='true'">
+          <xsl:attribute name="class">tableRow</xsl:attribute>
           <span class="key">
             <xsl:call-template name="mandalay:getStaticText">
               <xsl:with-param name="module" select="'GenericAddress'"/>
@@ -349,7 +354,7 @@
       </div>
 
       <xsl:if test="$setShowKeys='true'">
-      <div>
+        <div class="tableRow">
           <span class="key">
             <xsl:call-template name="mandalay:getStaticText">
               <xsl:with-param name="module" select="'GenericAddress'"/>
@@ -360,7 +365,7 @@
             <xsl:value-of select="postalCode"/>
           </span>
         </div>
-      <div>
+        <div class="tableRow">
           <span class="key">
             <xsl:call-template name="mandalay:getStaticText">
               <xsl:with-param name="module" select="'GenericAddress'"/>
@@ -382,6 +387,7 @@
       </xsl:if>
       <div>
         <xsl:if test="$setShowKeys='true'">
+          <xsl:attribute name="class">tableRow</xsl:attribute>
           <span class="key">
             <xsl:call-template name="mandalay:getStaticText">
               <xsl:with-param name="module" select="'GenericAddress'"/>
@@ -396,6 +402,7 @@
 <!--
       <div>
         <xsl:if test="$setShowKeys='true'">
+          <xsl:attribute name="class">tableRow</xsl:attribute>
           <span class="key">
             <xsl:call-template name="mandalay:getStaticText">
               <xsl:with-param name="module" select="'GenericAddress'"/>
@@ -410,6 +417,7 @@
 -->
       <div>
         <xsl:if test="$setShowKeys='true'">
+          <xsl:attribute name="class">tableRow</xsl:attribute>
           <span class="key">
             <xsl:call-template name="mandalay:getStaticText">
               <xsl:with-param name="module" select="'GenericAddress'"/>
@@ -421,6 +429,7 @@
           <xsl:value-of select="country"/>
         </span>
       </div>
+    </div>
   </xsl:template>
 
 </xsl:stylesheet>

ccm-sci-bundle/web/themes/mandalay/includes/types/GenericContact.xsl

@@ -303,7 +303,7 @@
     <!-- DE Wenn es Bilder gibt, dann soll das erste hier als Link angezeigt werden -->
     <!-- EN -->
     <xsl:if test="./targetItem/imageAttachments and $setImage = 'true'">
-      <a>
+      <a class="CIname">
         <xsl:attribute name="href">
           <xsl:text>/redirect/?oid=</xsl:text>
           <xsl:value-of select="./targetItem/@oid"/>
@@ -327,7 +327,7 @@
     </xsl:if>
     <xsl:if
       test="$setImageAndText = 'true' or not(./targetItem/imageAttachments) or $setImage = 'false'">
-      <a>
+      <a  class="CIname">
         <xsl:attribute name="href">
           <xsl:text>/redirect/?oid=</xsl:text>
           <xsl:value-of select="./targetItem/@oid"/>
@@ -386,7 +386,8 @@
   </xsl:template>
 
   <xsl:template name="CT_GenericContact_contactentries" match="contactentries">
-    <div class="contactentry">
+    <div class="contactentry table">
+      <div class="tableRow">
         <span class="key">
           <xsl:value-of select="key"/>
         </span>
@@ -413,6 +414,7 @@
           </xsl:choose>
         </span>
       </div>
+    </div>
   </xsl:template>
 
   <xsl:template name="CT_GenericContact_details">

ccm-sci-bundle/web/themes/mandalay/includes/types/GenericOrganizationalUnit.xsl

@@ -353,7 +353,7 @@
     <xsl:if test="./targetItem/imageAttachments and $setImage = 'true'">
       <xsl:choose>
         <xsl:when test="$setLinkToDetails = 'true' or (string-length(./linkDescription) > $setDescriptionLength and $setDescriptionLength != '0')">
-          <a>
+          <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">
@@ -386,7 +386,7 @@
     <xsl:if test="$setImageAndText = 'true' or not(./targetItem/imageAttachments) or $setImage = 'false'">
       <xsl:choose>
         <xsl:when test="$setLinkToDetails = 'true' or (string-length(./linkDescription) > $setDescriptionLength and $setDescriptionLength != '0')">
-          <a>
+          <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">

ccm-sci-bundle/web/themes/mandalay/includes/types/GenericPerson.xsl

@@ -266,7 +266,7 @@
     <!-- DE Wenn es Bilder gibt, dann soll das erste hier als Link angezeigt werden -->
     <!-- EN -->
     <xsl:if test="./targetItem/imageAttachments and $setImage = 'true'">
-      <a>
+      <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">
@@ -286,7 +286,7 @@
       </a>
     </xsl:if>
     <xsl:if test="$setImageAndText = 'true' or not(./targetItem/imageAttachments) or $setImage = 'false'">
-      <a>
+      <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">
@@ -342,10 +342,16 @@
     <xsl:param name="setNameDetails" select="'true'"/>
     <xsl:param name="setGender" select="'false'"/>
     <xsl:param name="setBirthdate" select="'false'"/>
+    <xsl:param name="setHomepage" select="'true'"/>
 
    <xsl:if test="$setFullname = 'true'">
       <div class="personFullName">
-        <!-- <xsl:value-of select="title"/> -->
+	<xsl:choose>
+	  <xsl:when test="($setHomepage = 'true') and (string-length(../contactentries[keyId = 'homepage']/value) &gt; 1)">
+	    <a>
+	      <xsl:attribute name="href">
+		<xsl:value-of select="../contactentries[keyId='homepage']/value"/>
+	      </xsl:attribute>
         <xsl:if test="string-length(normalize-space(./titlepre)) &gt; 0">
           <xsl:value-of select="./titlepre"/><xsl:text> </xsl:text>
         </xsl:if>
@@ -355,6 +361,36 @@
           <xsl:text> </xsl:text>
           <xsl:value-of select="titlepost"/>
         </xsl:if>
+	    </a>
+	  </xsl:when>
+	  <xsl:when test="($setHomepage = 'true') and string-length((./contacts/contact[@contactType='commonContact']/contactentries[keyId='homepage']/value) &gt; 1)">
+	    <a>
+	      <xsl:attribute name="href">
+		<xsl:value-of select="./contacts/contact[@contactType='commonContact']/contactentries[keyId='homepage']/value"/>
+	      </xsl:attribute>
+	      <xsl:if test="string-length(normalize-space(./titlepre)) &gt; 0">
+		<xsl:value-of select="./titlepre"/><xsl:text> </xsl:text>
+	      </xsl:if>
+	      <xsl:value-of select="./givenname"/><xsl:text> </xsl:text>
+	      <xsl:value-of select="surname"/> 
+	      <xsl:if test="string-length(normalize-space(./titlepost)) &gt; 0">
+		<xsl:text> </xsl:text>
+		<xsl:value-of select="titlepost"/>
+	      </xsl:if>	      	      
+	    </a>
+	  </xsl:when>
+	  <xsl:otherwise>
+	    <xsl:if test="string-length(normalize-space(./titlepre)) &gt; 0">
+	      <xsl:value-of select="./titlepre"/><xsl:text> </xsl:text>
+	    </xsl:if>
+	    <xsl:value-of select="./givenname"/><xsl:text> </xsl:text>
+	    <xsl:value-of select="surname"/> 
+	    <xsl:if test="string-length(normalize-space(./titlepost)) &gt; 0">
+	      <xsl:text> </xsl:text>
+	      <xsl:value-of select="titlepost"/>
+	    </xsl:if>
+	  </xsl:otherwise>
+	</xsl:choose>
       </div>
     </xsl:if>