Update des Mandalay-Themes

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

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

@@ -21,6 +21,14 @@
 /* DE CSS für das Contentcenter */
 /* EN CSS for the contentcenter */
 /********************************/
+
+/* Colors */
+h1, h2, h3
+{
+  color: #4a4a4a;
+}
+
+
 * {
   margin: 0em;
   padding: 0em;
@@ -77,7 +85,7 @@ h2 {
 
 #cmsPage .minWidth {
   margin: 0 3.5%;
-  min-width: 1300px;
+  min-width: 1000px;
 }
 
 #cmsPage .headerHeight {
@@ -157,9 +165,11 @@ div#bebopTabbedPane {
   bottom: 0;
   left: 0;
   right: 0;
-  height: auto !important;
+  height: 2em !important;
+  line-height: 2.7em;
   padding: 0.4em;
   font-size: 0.9em;
+  overflow: hidden;
 }
 
 div#bebopTabbedPane a {
@@ -171,6 +181,7 @@ span.bebopTab {
   border-top-left-radius: 0.5em;
   border-top-right-radius: 0.5em;
   padding: 0.4em;
+  white-space: nowrap;
   background-color: #2c2b2d;
   transition: all 0.5s ease;
   -o-transition: all 0.5s ease;
@@ -790,6 +801,10 @@ div#cmsHeader .cmsGlobalNavigation a {
   color: #ffffff;
 }
 
+span.logout a {
+    color: #ffffff;
+}
+
 div.cmsGlobalNavigation > span {
   padding-left: 1em;
 }
@@ -808,7 +823,7 @@ span.cmsGlobalNavigationWorkspace :before {
   content:url('../../../images/cms/home.png');
 }
 
-span.cmsGlobalNavigationSignOut :before {
+span.cmsGlobalNavigationSignOut :before, span.logout :before {
   content:url('../../../images/cms/lock.png');
 }
 
@@ -940,6 +955,7 @@ h3 {
   margin-bottom: 0.5em;
   padding: 0em;
   page-break-after: avoid;
+  font-size: inherit;
 }
 
 /* BebopTree */
@@ -1302,6 +1318,7 @@ a:focus, a:hover, a:active,
 	background-color: #ffffff;
 }
 #content {
+  margin: 0;
   border: 0;
   padding: 0;
 	min-height: inherit;
@@ -1351,6 +1368,7 @@ a:focus, a:hover, a:active,
   padding: 0 2em;
   color: #ffffff;
   background-color: #75051d;
+  background-image: none;
   height: 1.8em;
   box-shadow: inset 5px 5px 10px rgba(255,255,255,0.3),inset -5px -5px
   10px rgba(0,0,0,0.3);
@@ -1362,11 +1380,11 @@ input#file_upload{
   color: #ffffff;
   background-color: #75051d;
   height: 28px;
-   box-shadow: inset 5px 5px 10px rgba(255,255,255,0.3),inset -5px -5px
-   10px rgba(0,0,0,0.3);
+  box-shadow: inset 5px 5px 10px rgba(255,255,255,0.3),inset -5px -5px 10px rgba(0,0,0,0.3);
 }
 #content form input[type="submit"]:hover {
   background-color: #cc0033 ;
+  background-image: none;
 }
 
 #content form input[type="submit"]:active {

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

@@ -250,6 +250,17 @@
         </xsl:otherwise>
       </xsl:choose> 
     </xsl:if>
+
+    <!-- DE Hinweise anzeigen -->
+    <!-- EN Display form hints -->
+    <xsl:if test="../following-sibling::bebop:cell/*/@hint != ''">
+      <span class="hint">
+        <xsl:attribute name="content">
+          <xsl:value-of select="../following-sibling::bebop:cell/*/@hint"/>
+        </xsl:attribute>
+        (?)
+      </span>
+    </xsl:if>
   </xsl:template>
     
 </xsl:stylesheet>

ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsGlobalNavigation.xsl

@@ -79,6 +79,14 @@
     </span>
   </xsl:template>
   
+  <!-- DE -->
+  <!-- EN -->
+  <xsl:template match="cms:adminCenter">
+    <span class="cmsGlobalNavigationAdminCenter">
+      <xsl:call-template name="cms:globalNavigationEntry"/>
+    </span>
+  </xsl:template>
+  
   <!-- DE -->
   <!-- EN -->
   <xsl:template match="cms:workspace">

ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsImageDisplay.xsl

@@ -68,6 +68,13 @@
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setContext">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module" select="'cms'"/>
+        <xsl:with-param name="setting" select="'imageDisplay/setContext'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
     
     <img class="cmsImageDisplay">
       <xsl:attribute name="src">
@@ -89,20 +96,14 @@
       <div class="cmsImageInfoOverlay">
         <xsl:if test="$setImageName = 'true'">
           <span class="key">
-            <xsl:call-template name="mandalay:getStaticText">
-              <xsl:with-param name="module" select="'cms'"/>
-              <xsl:with-param name="id" select="'imageDisplay/infoOverlay/name'"/>
-            </xsl:call-template>
+            <xsl:value-of select="@name_label"/>
           </span>
           <span class="value"><xsl:value-of select="@name"/></span>
           <br/>
         </xsl:if>
         <xsl:if test="$setMimeType = 'true'">
           <span class="key">
-            <xsl:call-template name="mandalay:getStaticText">
-              <xsl:with-param name="module" select="'cms'"/>
-              <xsl:with-param name="id" select="'imageDisplay/infoOverlay/type'"/>
-            </xsl:call-template>
+            <xsl:value-of select="@mime_type_label"/>
           </span>
           <span class="value">
             <xsl:choose>
@@ -123,20 +124,21 @@
         </xsl:if>
         <xsl:if test="$setDimensions = 'true'">
           <span class="key">
-            <xsl:call-template name="mandalay:getStaticText">
-              <xsl:with-param name="module" select="'cms'"/>
-              <xsl:with-param name="id" select="'imageDisplay/infoOverlay/dimensions'"/>
-            </xsl:call-template>
+            <xsl:value-of select="@dimension_label"/>
           </span>
-          <span class="value"><xsl:value-of select="@height"/>x<xsl:value-of select="@width"/></span>
+          <span class="value"><xsl:value-of select="@width"/> x <xsl:value-of select="@height"/></span>
+          <br/>
+        </xsl:if>
+        <xsl:if test="$setContext = 'true'">
+          <span class="key">
+            <xsl:value-of select="@context_label"/>
+          </span>
+          <span class="value"><xsl:value-of select="@context"/></span>
           <br/>
         </xsl:if>
         <xsl:if test="$setCaption = 'true'">
           <span class="key">
-            <xsl:call-template name="mandalay:getStaticText">
-              <xsl:with-param name="module" select="'cms'"/>
-              <xsl:with-param name="id" select="'imageDisplay/infoOverlay/caption'"/>
-            </xsl:call-template>
+            <xsl:value-of select="@caption_label"/>
           </span>
           <span class="value">
             <xsl:value-of select="@caption"/>

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

@@ -54,6 +54,7 @@
   <xsl:import href="mandalay/languageSelector.xsl"/>
   <xsl:import href="mandalay/lastModified.xsl"/>
   <xsl:import href="mandalay/layoutParser.xsl"/>
+  <xsl:import href="mandalay/moreButton.xsl"/>
   <xsl:import href="mandalay/notes.xsl"/>
   <xsl:import href="mandalay/paginator.xsl"/>
   <xsl:import href="mandalay/quicksearch.xsl"/>

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

@@ -422,6 +422,14 @@
     </xsl:choose>
   </xsl:template>
 
+  <xsl:template match="useImage">
+    <xsl:apply-templates select="$resultTree//cms:item" mode="image"/>
+  </xsl:template>
+
+  <xsl:template match="useLeadText">
+    <xsl:apply-templates select="$resultTree//cms:item" mode="lead"/>
+  </xsl:template>
+
   <xsl:template match="useLogin">
     <xsl:call-template name="mandalay:loginLogout"/>
   </xsl:template>
@@ -651,6 +659,10 @@
     <xsl:apply-templates select="$resultTree/cms:globalNavigation/cms:contentCenter"/>
   </xsl:template>
   
+  <xsl:template match="useAdminCenterLink">
+    <xsl:apply-templates select="$resultTree/cms:globalNavigation/cms:adminCenter"/>
+  </xsl:template>
+  
   <xsl:template match="useWorkspaceLink">
     <xsl:apply-templates select="$resultTree/cms:globalNavigation/cms:workspace"/>
   </xsl:template>

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

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE stylesheet [<!ENTITY nbsp '&#160;'>]>
+
+<!-- 
+    Copyright: 2006, 2007, 2008 Sören Bernstein
+  
+    This file is part of Mandalay.
+
+    Mandalay is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    Mandalay is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Mandalay.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<!-- DE
+  Hier wird ein Link aus den XML-Settings erzeugt
+-->
+
+<!-- EN
+  Creates a link from XML-Settings
+-->
+
+<!-- Autor: Sören Bernstein -->
+
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+  xmlns:cms="http://www.arsdigita.com/cms/1.0" 
+  xmlns:nav="http://ccm.redhat.com/navigation"
+  xmlns:mandalay="http://mandalay.quasiweb.de" 
+  exclude-result-prefixes="xsl bebop cms nav mandalay"
+  version="1.0">
+
+  <xsl:template name="mandalay:moreButton">
+    <xsl:param name="href"/>
+    <xsl:param name="module"/>
+
+    <span class="moreButton">
+      <a>
+        <xsl:attribute name="href">
+          <xsl:text>/redirect/?oid=</xsl:text>
+          <xsl:value-of select="$href"/>
+        </xsl:attribute>
+        <xsl:attribute name="title">
+          <xsl:call-template name="mandalay:getStaticText">
+            <xsl:with-param name="module" select="$module"/>
+            <xsl:with-param name="id" select="'moreButtonTitle'"/>
+          </xsl:call-template>
+        </xsl:attribute>
+        <xsl:call-template name="mandalay:getStaticText">
+          <xsl:with-param name="module" select="$module"/>
+          <xsl:with-param name="id" select="'moreButton'"/>
+        </xsl:call-template>
+      </a>
+    </span>
+
+  </xsl:template>
+
+</xsl:stylesheet>

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

@@ -368,8 +368,7 @@
         <xsl:attribute name="class">
           <xsl:choose>
             <xsl:when test="$withColorset='true'">
-              <xsl:value-of select="concat('menulevel_', $level, ' colorset_', $csNum, ' selected')"
-              />
+              <xsl:value-of select="concat('menulevel_', $level, ' colorset_', $csNum, ' selected')"/>
             </xsl:when>
             <xsl:otherwise>
               <xsl:value-of select="concat('menulevel_', $level, ' selected')"/>

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

@@ -16,7 +16,9 @@
             <xsl:attribute name="accept-charset">UTF-8</xsl:attribute>
             <xsl:if test="string-length(./@show) &gt; 0">
                 <input type="hidden" name="show">	    
-	    <xsl:attribute name="value"><xsl:value-of select="./@show"/></xsl:attribute>
+                    <xsl:attribute name="value">
+                        <xsl:value-of select="./@show"/>
+                    </xsl:attribute>
                 </input>
             </xsl:if>
             <xsl:choose>
@@ -106,8 +108,12 @@
             <xsl:choose>
                 <xsl:when test="./@type='text'">
                     <span>
-	    <xsl:attribute name="class"><xsl:value-of select="'textFilter'"/></xsl:attribute>
-	    <xsl:attribute name="id"><xsl:value-of select="concat(../../@customName, ./@label, 'Filter')"/></xsl:attribute>
+                        <xsl:attribute name="class">
+                            <xsl:value-of select="'textFilter'"/>
+                        </xsl:attribute>
+                        <xsl:attribute name="id">
+                            <xsl:value-of select="concat(../../@customName, ./@label, 'Filter')"/>
+                        </xsl:attribute>
                         <label>
                             <xsl:attribute name="for">
                                 <xsl:value-of select="concat(./@label, 'Filter')"/>
@@ -121,16 +127,26 @@
                             <xsl:attribute name="type">text</xsl:attribute>
                             <xsl:attribute name="size">20</xsl:attribute>
                             <xsl:attribute name="maxlength">512</xsl:attribute>
-	      <xsl:attribute name="id"><xsl:value-of select="concat(./@label, 'Filter')"/></xsl:attribute>
-	      <xsl:attribute name="name"><xsl:value-of select="./@label"/></xsl:attribute>
-	      <xsl:attribute name="value"><xsl:value-of select="./@value"/></xsl:attribute>
+                            <xsl:attribute name="id">
+                                <xsl:value-of select="concat(./@label, 'Filter')"/>
+                            </xsl:attribute>
+                            <xsl:attribute name="name">
+                                <xsl:value-of select="./@label"/>
+                            </xsl:attribute>
+                            <xsl:attribute name="value">
+                                <xsl:value-of select="./@value"/>
+                            </xsl:attribute>
                         </xsl:element>
                     </span>
                 </xsl:when>
                 <xsl:when test="(./@type='select') or (./@type='compare')">
                     <span>
-	    <xsl:attribute name="class"><xsl:value-of select="'selectFilter'"/></xsl:attribute>
-	    <xsl:attribute name="id"><xsl:value-of select="concat(../../@customName, ./@label, 'Filter')"/></xsl:attribute>	    
+                        <xsl:attribute name="class">
+                            <xsl:value-of select="'selectFilter'"/>
+                        </xsl:attribute>
+                        <xsl:attribute name="id">
+                            <xsl:value-of select="concat(../../@customName, ./@label, 'Filter')"/>
+                        </xsl:attribute>	    
                         <label>
                             <xsl:attribute name="for">
                                 <xsl:value-of select="concat(./@label, 'Filter')"/>
@@ -142,11 +158,17 @@
                         </label>
                         <xsl:element name="select">	 
                             <xsl:attribute name="size">1</xsl:attribute>
-	      <xsl:attribute name="id"><xsl:value-of select="concat(./@label, 'Filter')"/></xsl:attribute>
-	      <xsl:attribute name="name"><xsl:value-of select="./@label"/></xsl:attribute>
+                            <xsl:attribute name="id">
+                                <xsl:value-of select="concat(./@label, 'Filter')"/>
+                            </xsl:attribute>
+                            <xsl:attribute name="name">
+                                <xsl:value-of select="./@label"/>
+                            </xsl:attribute>
                             <xsl:for-each select="./option">
                                 <xsl:element name="option">
-		  <xsl:attribute name="value"><xsl:value-of select="./@label"/></xsl:attribute>
+                                    <xsl:attribute name="value">
+                                        <xsl:value-of select="./@label"/>
+                                    </xsl:attribute>
                                     <xsl:if test="./@label = ../@selected">
                                         <xsl:attribute name="selected">selected</xsl:attribute>
                                     </xsl:if>
@@ -176,6 +198,121 @@
                         </xsl:element>
                     </span>
                 </xsl:when>
+                <xsl:when test="(./@type='categoryFilter')">
+                    <span>
+                        <xsl:attribute name="class">
+                            <xsl:value-of select="'categoryFilter'"/>
+                        </xsl:attribute>
+                        <xsl:attribute name="id">
+                            <xsl:value-of select="concat(../../@customName, ./@label, 'Filter')"/>
+                        </xsl:attribute>
+                        <label>
+                            <xsl:attribute name="for">
+                                <xsl:value-of select="concat(./@label, 'Filter')"/>
+                            </xsl:attribute>
+                            <xsl:call-template name="mandalay:getStaticText">
+                                <xsl:with-param name="module" select="'filterControls'"/>
+                                <xsl:with-param name="id" select="concat(../../@customName, ./@label)"/>
+                            </xsl:call-template>
+                        </label>
+                        <xsl:choose>
+                            <xsl:when test="./multiple = 'true'">
+                                <xsl:element name="input">
+                                    <xsl:attribute name="type">text</xsl:attribute>
+                                    <xsl:attribute name="size">42</xsl:attribute>
+                                    <xsl:attribute name="maxlength">1024</xsl:attribute>
+                                    <xsl:attribute name="id">
+                                        <xsl:value-of select="concat(./@label, 'Filter')"/>
+                                    </xsl:attribute>
+                                    <xsl:attribute name="name">
+                                        <xsl:value-of select="./@label"/>
+                                    </xsl:attribute>
+                                    <xsl:attribute name="value">
+                                        <xsl:value-of select="./searchString"/>
+                                    </xsl:attribute>
+                                </xsl:element>
+                                <span>
+                                    <xsl:attribute name="id">
+                                        <xsl:value-of select="concat(../../@customName, ./@label, 'Filter', 'Invalid')"/>
+                                    </xsl:attribute>
+                                    <xsl:for-each select="./invalid/value">
+                                        <del>
+                                            <xsl:value-of select="."/>
+                                        </del>
+                                    </xsl:for-each>
+                                </span>
+                                <script>
+                                    $(function() {
+                                    var availableTags = [ <xsl:value-of select="./categoriesStr"/> ];
+                        
+                                    function split(value) {
+                                    return value.split("<xsl:value-of select="./separator"/>");
+                                    }
+                                
+                                    function extractLast(term) {
+                                    return split(term).pop();
+                                    }
+                                
+                                    $("<xsl:value-of select="concat('#', concat(./@label, 'Filter'))"/>")
+                                    .bind("keydown", function(event) {
+                                    if (event.keyCode === $.ui.keyCode.TAB &amp;&amp; 
+                                    $(this).data("ui-autocomplete").menu.active) {
+                                    event.preventDefault();
+                                    }
+                                    })
+                                    .autocomplete({
+                                    minLength: 0,
+                                    source: function(request, response) {
+                                    response($.ui.autocomplete.filter(availableTags, extractLast (request.term)));
+                                    },
+                                    focus: function() {
+                                    return false;
+                                    },
+                                    select: function(event, ui) {
+                                    var terms = split(this.value);
+                                    terms.pop();
+                                    terms.push(ui.item.value);
+                                    terms.push("");
+                                    this.value = terms.join(" ");
+                                    return false;
+                                    }
+                                    });
+                                    });
+                                </script>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <select size="1">
+                                    <xsl:attribute name="id">
+                                        <xsl:value-of select="concat(./@label, 'Filter')"/>
+                                    </xsl:attribute>
+                                    <xsl:attribute name="name">
+                                        <xsl:value-of select="./@label"/>
+                                    </xsl:attribute>
+                                    <option value="">
+                                        <xsl:call-template name="mandalay:getStaticText">
+                                            <xsl:with-param name="module" 
+                                                            select="'filterControls'"/>
+                                            <xsl:with-param name="id" 
+                                                            select="concat(../../@customName,./@label,'All')"/>
+                                        </xsl:call-template>
+                                    </option>
+                                    <xsl:for-each select="./categories/category">
+                                        <option>
+                                            <xsl:if test="./@selected = 'selected'">
+                                                <xsl:attribute name="selected">selected</xsl:attribute>
+                                            </xsl:if>
+                                            <xsl:attribute name="value">
+                                                <xsl:value-of select="./@id"/>
+                                            </xsl:attribute>
+                                            <xsl:value-of select="."/>
+                                        </option>
+                                    </xsl:for-each>
+                                </select>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                        
+                    </span>
+                </xsl:when>
             </xsl:choose>
         </xsl:for-each>
     </xsl:template>
@@ -195,12 +332,16 @@
             </label>
             <select>
                 <xsl:attribute name="size">1</xsl:attribute>
-	<xsl:attribute name="id"><xsl:value-of select="concat(../../@customName, 'SortBy')"/></xsl:attribute>
+                <xsl:attribute name="id">
+                    <xsl:value-of select="concat(../../@customName, 'SortBy')"/>
+                </xsl:attribute>
                 <xsl:attribute name="name">sort</xsl:attribute>	     
                 <xsl:for-each select="./sortFields">
                     <xsl:for-each select="./sortField">
                         <xsl:element name="option">
-	      <xsl:attribute name="value"><xsl:value-of select="./@label"/></xsl:attribute>
+                            <xsl:attribute name="value">
+                                <xsl:value-of select="./@label"/>
+                            </xsl:attribute>
                             <xsl:if test="./@label = ../@sortBy">
                                 <xsl:attribute name="selected">selected</xsl:attribute>
                             </xsl:if>

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

@@ -29,12 +29,9 @@
 	exclude-result-prefixes="xsl bebop cms"
 	version="1.0">
 
-  <!-- DE Vollansicht -->
-  <!-- EN Detailed view -->
-  <xsl:template name="CT_Address_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.Address']" mode="detailed_view">
-
-    <!-- DE Hole alle benötigten Einstellungen-->
-    <!-- EN Getting all needed setting-->
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Address']" mode="lead">
     <xsl:variable name="setShowKeys">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'Address'"/>
@@ -49,6 +46,24 @@
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
+
+    <xsl:call-template name="CT_GenericAddress_details">
+      <xsl:with-param name="setShowKeys" select="$setShowKeys"/>
+    </xsl:call-template>
+
+    <xsl:if test="./lead and $setLeadText = 'true'">
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./lead"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Address']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
     <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'Address'"/>
@@ -78,17 +93,6 @@
       </xsl:call-template>
     </xsl:variable>
 
-    <div id="greeting">
-      <xsl:call-template name="CT_GenericAddress_details">
-        <xsl:with-param name="setShowKeys" select="$setShowKeys"/>
-      </xsl:call-template>
-      
-      <xsl:if test="./lead and $setLeadText = 'true'">
-        <div id="lead">
-          <xsl:value-of disable-output-escaping="yes" select="./lead"/>
-        </div>
-      </xsl:if>
-    </div>
     <xsl:if test="$setImage = 'true'">
       <xsl:call-template name="mandalay:imageAttachment">
         <xsl:with-param name="showCaption" select="$setImageCaption"/>
@@ -96,6 +100,21 @@
         <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
       </xsl:call-template>
     </xsl:if>
+  </xsl:template>
+
+  <!-- DE Vollansicht -->
+  <!-- EN Detailed view -->
+  <xsl:template name="CT_Address_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.Address']" mode="detailed_view">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setShowKeys">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'Address'"/>
+        <xsl:with-param name="setting" select="'setShowKeys'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
 
     <div id="mainBody">
       <xsl:call-template name="CT_GenericAddress_details">
@@ -127,14 +146,45 @@
         <xsl:with-param name="default" select="'0'"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'Address'"/>
+        <xsl:with-param name="setting" select="'listView/setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:variable name="setMoreButton">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'Address'"/>
         <xsl:with-param name="setting" select="'listView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
+    <xsl:if test="$setImage = 'true' and nav:attribute[@name='imageAttachments.image.id']">
+      <a>
+        <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
+        <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">
@@ -152,6 +202,7 @@
         <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">
@@ -163,26 +214,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(nav:attribute[@name='lead'], 1, $setLeadTextLength)" />
             <xsl:if test="string-length(nav:attribute[@name='lead']) > $setLeadTextLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="nav:path"/>
                   <xsl:with-param name="module" select="'Address'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'Address'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="nav:path"/>
+            <xsl:with-param name="module" select="'Address'"/>
+          </xsl:call-template>
+        </xsl:if>
       </span>
     </xsl:if>
   </xsl:template>
@@ -298,26 +344,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(./linkDescription, 1, $setDescriptionLength)" />
             <xsl:if test="string-length(./linkDescription) > $setDescriptionLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="./targetItem/@oid"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="./targetItem/@oid"/>
                   <xsl:with-param name="module" select="'Address'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'Address'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="./targetItem/@oid"/>
+            <xsl:with-param name="module" select="'Address'"/>
+          </xsl:call-template>
+        </xsl:if>
       </xsl:if>
     </xsl:if>
   </xsl:template>

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

@@ -40,9 +40,27 @@ Article content type
   exclude-result-prefixes="xsl cms nav mandalay" 
   version="1.0">
 
-  <!-- DE Vollansicht -->
-  <!-- EN Detailed view -->
-  <xsl:template name="CT_Article_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.Article']" mode="detailed_view">
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Article']" mode="lead">
+    <xsl:variable name="setLeadText">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'Article'"/>
+        <xsl:with-param name="setting" select="'setLeadText'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="./lead and $setLeadText = 'true'">
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./lead"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Article']" mode="image">
 
     <!-- DE Hole alle benötigten Einstellungen-->
     <!-- EN Getting all needed setting-->
@@ -74,21 +92,7 @@ Article content type
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="setLeadText">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'Article'"/>
-        <xsl:with-param name="setting" select="'setLeadText'"/>
-        <xsl:with-param name="default" select="'true'"/>
-      </xsl:call-template>
-    </xsl:variable>
 
-    <div id="greeting">
-      <xsl:if test="./lead and $setLeadText = 'true'">
-        <div id="lead">
-          <xsl:value-of disable-output-escaping="yes" select="./lead"/>
-        </div>
-      </xsl:if>
-    </div>
     <xsl:if test="$setImage = 'true'">
       <xsl:call-template name="mandalay:imageAttachment">
         <xsl:with-param name="showCaption" select="$setImageCaption"/>
@@ -96,7 +100,14 @@ Article content type
         <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
       </xsl:call-template>
     </xsl:if>
+  </xsl:template>
 
+  <!-- DE Vollansicht -->
+  <!-- EN Detailed view -->
+  <xsl:template name="CT_Article_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.Article']" mode="detailed_view">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
     <xsl:if test="./textAsset/content">
       <div id="mainBody">
         <xsl:value-of disable-output-escaping="yes" select="./textAsset/content"/>
@@ -126,15 +137,22 @@ Article content type
         <xsl:with-param name="default" select="'0'"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'Article'"/>
+        <xsl:with-param name="setting" select="'listView/setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:variable name="setMoreButton">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'Article'"/>
         <xsl:with-param name="setting" select="'listView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
-    <xsl:if test="nav:attribute[@name='imageAttachments.image.id']">
+    <xsl:if test="$setImage = 'true' and nav:attribute[@name='imageAttachments.image.id']">
       <a>
         <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
         <xsl:attribute name="title">
@@ -187,26 +205,21 @@ Article content type
             <xsl:value-of disable-output-escaping="yes" select="substring(nav:attribute[@name='lead'], 1, $setLeadTextLength)" />
             <xsl:if test="string-length(nav:attribute[@name='lead']) > $setLeadTextLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="nav:path"/>
                   <xsl:with-param name="module" select="'Article'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'Article'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="nav:path"/>
+            <xsl:with-param name="module" select="'Article'"/>
+          </xsl:call-template>
+        </xsl:if>
       </span>
     </xsl:if>
 
@@ -269,7 +282,7 @@ Article content type
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'Article'"/>
         <xsl:with-param name="setting" select="'linkView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
@@ -324,26 +337,21 @@ Article content type
             <xsl:value-of disable-output-escaping="yes" select="substring(./linkDescription, 1, $setDescriptionLength)" />
             <xsl:if test="string-length(./linkDescription) > $setDescriptionLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="./targetItem/@oid"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="./targetItem/@oid"/>
                   <xsl:with-param name="module" select="'Article'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'Article'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="./targetItem/@oid"/>
+            <xsl:with-param name="module" select="'Article'"/>
+          </xsl:call-template>
+        </xsl:if>
       </xsl:if>
     </xsl:if>
   </xsl:template>

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

@@ -29,12 +29,9 @@
 	exclude-result-prefixes="xsl bebop cms nav"
 	version="1.0">
 
-  <!-- DE Vollansicht -->
-  <!-- EN Detailed view -->
-  <xsl:template name="CT_Bookmark_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.Bookmark']" mode="detailed_view">
-
-    <!-- DE Hole alle benötigten Einstellungen-->
-    <!-- EN Getting all needed setting-->
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Bookmark']" mode="lead">
     <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'Bookmark'"/>
@@ -42,6 +39,20 @@
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
+
+    <xsl:if test="./lead and $setLeadText = 'true'">
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./lead"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Bookmark']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
     <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'Bookmark'"/>
@@ -71,13 +82,6 @@
       </xsl:call-template>
     </xsl:variable>
 
-    <div id="greeting">
-      <xsl:if test="./description and $setLeadText = 'true'">
-        <div id="lead">
-          <xsl:value-of disable-output-escaping="yes" select="./description"/>
-        </div>
-      </xsl:if>
-    </div>
     <xsl:if test="$setImage = 'true'">
       <xsl:call-template name="mandalay:imageAttachment">
         <xsl:with-param name="showCaption" select="$setImageCaption"/>
@@ -85,6 +89,14 @@
         <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
       </xsl:call-template>
     </xsl:if>
+  </xsl:template>
+
+  <!-- DE Vollansicht -->
+  <!-- EN Detailed view -->
+  <xsl:template name="CT_Bookmark_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.Bookmark']" mode="detailed_view">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
 
     <div id="mainBody">
       <xsl:value-of disable-output-escaping="yes" select="./textAsset/content"/>
@@ -134,14 +146,45 @@
         <xsl:with-param name="default" select="'0'"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'Bookmark'"/>
+        <xsl:with-param name="setting" select="'listView/setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:variable name="setMoreButton">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'Bookmark'"/>
         <xsl:with-param name="setting" select="'listView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
+    <xsl:if test="$setImage = 'true' and nav:attribute[@name='imageAttachments.image.id']">
+      <a>
+        <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
+        <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>
+
     <xsl:choose>
       <xsl:when test="$setLinkToDetails = 'true' or $setDescription = 'false' or (string-length(nav:attribute[@name='description']) > $setDescriptionLength and $setDescriptionLength != '0') or not(nav:attribute[@name='url'])">
         <a class="CIname">
@@ -193,26 +236,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(nav:attribute[@name='description'], 1, $setDescriptionLength)" />
             <xsl:if test="string-length(nav:attribute[@name='description']) > $setDescriptionLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
-                        <xsl:with-param name="module" select="'Bookmark'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="nav:path"/>
+                  <xsl:with-param name="module" select="'Boorkmark'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'Bookmark'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="nav:path"/>
+            <xsl:with-param name="module" select="'Bookmark'"/>
+          </xsl:call-template>
+        </xsl:if>
       </span>
     </xsl:if>
     <br />
@@ -282,7 +320,7 @@
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'Bookmark'"/>
         <xsl:with-param name="setting" select="'linkView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
@@ -372,26 +410,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(./linkDescription, 1, $setDescriptionLength)" />
             <xsl:if test="string-length(./linkDescription) > $setDescriptionLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="./targetItem/@oid"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="./targetItem/@oid"/>
                   <xsl:with-param name="module" select="'Bookmark'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'Bookmark'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="./targetItem/@oid"/>
+            <xsl:with-param name="module" select="'Bookmark'"/>
+          </xsl:call-template>
+        </xsl:if>
       </xsl:if>
     </xsl:if>
   </xsl:template>

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

@@ -27,12 +27,16 @@
   xmlns:mandalay="http://mandalay.quasiweb.de"
   exclude-result-prefixes="xsl bebop cms" version="1.0">
 
-  <!-- DE Vollansicht -->
-  <!-- EN Detailed view -->
-  <xsl:template name="CT_Contact_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.Contact']" mode="detailed_view">
-
-    <!-- DE Hole alle benötigten Einstellungen-->
-    <!-- EN Getting all needed setting-->
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Contact']" mode="lead">
+    <xsl:variable name="setLeadText">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'Contact'"/>
+        <xsl:with-param name="setting" select="'setLeadText'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:variable name="setFullname">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module" select="'GenericContact'"/>
@@ -82,50 +86,6 @@
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="setLeadText">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'GenericContact'"/>
-        <xsl:with-param name="setting" select="'setLeadText'"/>
-        <xsl:with-param name="default" select="'true'"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="setImage">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'GenericContact'"/>
-        <xsl:with-param name="setting" select="'setImage'"/>
-        <xsl:with-param name="default" select="'true'"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="setImageMaxHeight">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'GenericContact'"/>
-        <xsl:with-param name="setting" select="'setImageMaxHeight'"/>
-        <xsl:with-param name="default" select="''"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="setImageMaxWidth">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'GenericContact'"/>
-        <xsl:with-param name="setting" select="'setImageMaxWidth'"/>
-        <xsl:with-param name="default" select="''"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="setImageCaption">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'GenericContact'"/>
-        <xsl:with-param name="setting" select="'setImageCaption'"/>
-        <xsl:with-param name="default" select="'true'"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <div id="greeting">
-      <xsl:if test="count(./organizationalunit) &gt; 0">
-        <h3>
-          <xsl:call-template name="mandalay:getStaticText">
-            <xsl:with-param name="module" select="'GenericContact'"/>
-            <xsl:with-param name="id" select="./organizationalunit/link/contact_type"/>
-          </xsl:call-template>
-        </h3>
-      </xsl:if>
 
     <xsl:call-template name="CT_GenericContact_details">
       <xsl:with-param name="setFullname" select="$setFullname"/>
@@ -138,11 +98,47 @@
     </xsl:call-template>
 
     <xsl:if test="./lead and $setLeadText = 'true'">
-        <div id="lead">
+      <div class="lead">
         <xsl:value-of disable-output-escaping="yes" select="./lead"/>
       </div>
     </xsl:if>
-    </div>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Contact']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'Contact'"/>
+        <xsl:with-param name="setting" select="'setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageMaxHeight">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'Contact'"/>
+        <xsl:with-param name="setting" select="'setImageMaxHeight'"/>
+        <xsl:with-param name="default" select="''"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageMaxWidth">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'Contact'"/>
+        <xsl:with-param name="setting" select="'setImageMaxWidth'"/>
+        <xsl:with-param name="default" select="''"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageCaption">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'Contact'"/>
+        <xsl:with-param name="setting" select="'setImageCaption'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
     <xsl:if test="$setImage = 'true'">
       <xsl:call-template name="mandalay:imageAttachment">
         <xsl:with-param name="showCaption" select="$setImageCaption"/>
@@ -150,6 +146,14 @@
         <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
       </xsl:call-template>
     </xsl:if>
+  </xsl:template>
+
+  <!-- DE Vollansicht -->
+  <!-- EN Detailed view -->
+  <xsl:template name="CT_Contact_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.Contact']" mode="detailed_view">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
 
     <xsl:if test="./textAsset/content">
       <div id="mainBody">
@@ -180,13 +184,44 @@
         <xsl:with-param name="default" select="'0'"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="setMoreButton">
+    <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'GenericContact'"/>
-        <xsl:with-param name="setting" select="'listView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="module"  select="'Contact'"/>
+        <xsl:with-param name="setting" select="'listView/setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setMoreButton">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'Contact'"/>
+        <xsl:with-param name="setting" select="'listView/setMoreButton'"/>
+        <xsl:with-param name="default" select="'auto'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="$setImage = 'true' and nav:attribute[@name='imageAttachments.image.id']">
+      <a>
+        <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
+        <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">
@@ -207,6 +242,7 @@
         <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">
@@ -219,28 +255,21 @@
               select="substring(nav:attribute[@name='lead'], 1, $setLeadTextLength)"/>
             <xsl:if test="string-length(nav:attribute[@name='lead']) > $setLeadTextLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href">
-                      <xsl:value-of select="nav:path"/>
-                    </xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
-                        <xsl:with-param name="module" select="'GenericContact'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="nav:path"/>
+                  <xsl:with-param name="module" select="'Contact'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'GenericContact'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a>
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="nav:path"/>
+            <xsl:with-param name="module" select="'Contact'"/>
+          </xsl:call-template>
+        </xsl:if>
       </span>
     </xsl:if>
   </xsl:template>
@@ -302,7 +331,7 @@
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module" select="'GenericContact'"/>
         <xsl:with-param name="setting" select="'linkView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
@@ -364,29 +393,21 @@
               select="substring(./linkDescription, 1, $setDescriptionLength)"/>
             <xsl:if test="string-length(./linkDescription) > $setDescriptionLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href">
-                      <xsl:text>/redirect/?oid=</xsl:text>
-                      <xsl:value-of select="./targetItem/@oid"/>
-                    </xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
-                        <xsl:with-param name="module" select="'GenericContact'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="./targetItem/@oid"/>
+                  <xsl:with-param name="module" select="'Contact'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'GenericContact'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a>
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="./targetItem/@oid"/>
+            <xsl:with-param name="module" select="'Contact'"/>
+          </xsl:call-template>
+        </xsl:if>
       </xsl:if>
     </xsl:if>
   </xsl:template>

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

@@ -27,11 +27,22 @@
 		  xmlns:mandalay="http://mandalay.quasiweb.de"
 		  exclude-result-prefixes="xsl bebop cms nav"
 		  version="1.0">
+
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Department']" mode="lead">
+    <xsl:call-template name="CT_OrganizationalUnit_lead"/>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Department']" mode="image">
+    <xsl:call-template name="CT_OrganizationalUnit_image"/>
+  </xsl:template>
+
   <!-- DE Vollansicht -->
   <!-- EN Detailed view -->
-  <xsl:template name="CT_Department_graphics" 
-		match="cms:item[objectType='com.arsdigita.cms.contenttypes.Department']"		
-		mode="detailed_view">
+  <xsl:template name="CT_Department_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.Department']" mode="detailed_view">
     <!-- Simply call the template for the GenericOrganization -->
     <xsl:call-template name="CT_GenericOrganizationalUnit_graphics"/>
   </xsl:template>
@@ -46,7 +57,4 @@
     <xsl:call-template name="CT_GenericOrganizationalUnit_List"/>
   </xsl:template>
 
-
-
-
 </xsl:stylesheet>

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

@@ -29,33 +29,30 @@
   exclude-result-prefixes="xsl bebop cms nav"
   version="1.0">
 
-  <!-- DE Vollansicht -->
-  <!-- EN Detailed view -->
-  <xsl:template name="CT_Event_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.Event']" mode="detailed_view">
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Event']" mode="lead">
+    <xsl:variable name="setLeadText">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'Event'"/>
+        <xsl:with-param name="setting" select="'setLeadText'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="./lead and $setLeadText = 'true'">
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./lead"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Event']" mode="image">
 
     <!-- DE Hole alle benötigten Einstellungen-->
     <!-- EN Getting all needed setting-->
-    <xsl:variable name="dateSeparator">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'Event'"/>
-        <xsl:with-param name="setting" select="'dateSeparator'"/>
-        <xsl:with-param name="default" select="' :: '"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="timeSeparator">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'Event'"/>
-        <xsl:with-param name="setting" select="'timeSeparator'"/>
-        <xsl:with-param name="default" select="' - '"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="setDateFormat">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'Event'"/>
-        <xsl:with-param name="setting" select="'setDateFormat'"/>
-        <xsl:with-param name="default" select="'S'"/>
-      </xsl:call-template>
-    </xsl:variable>
     <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'Event'"/>
@@ -84,11 +81,41 @@
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="setLeadText">
+
+    <xsl:if test="$setImage = 'true'">
+      <xsl:call-template name="mandalay:imageAttachment">
+        <xsl:with-param name="showCaption" select="$setImageCaption"/>
+        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Vollansicht -->
+  <!-- EN Detailed view -->
+  <xsl:template name="CT_Event_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.Event']" mode="detailed_view">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="dateSeparator">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'Event'"/>
-        <xsl:with-param name="setting" select="'setLeadText'"/>
-        <xsl:with-param name="default" select="'true'"/>
+        <xsl:with-param name="setting" select="'dateSeparator'"/>
+        <xsl:with-param name="default" select="' :: '"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="timeSeparator">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'Event'"/>
+        <xsl:with-param name="setting" select="'timeSeparator'"/>
+        <xsl:with-param name="default" select="' - '"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setDateFormat">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'Event'"/>
+        <xsl:with-param name="setting" select="'setDateFormat'"/>
+        <xsl:with-param name="default" select="'S'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setLocation">
@@ -141,21 +168,6 @@
       </xsl:call-template>
     </xsl:variable>
 
-
-    <xsl:if test="./lead and $setLeadText = 'true'">
-      <div id="lead">
-        <xsl:value-of disable-output-escaping="yes" select="./lead"/>
-      </div>
-    </xsl:if>
-
-    <xsl:if test="$setImage">
-      <xsl:call-template name="mandalay:imageAttachment">
-        <xsl:with-param name="showCaption" select="$setImageCaption" />
-        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
-        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
-      </xsl:call-template>
-    </xsl:if>
-
     <div id="mainBody">
       <div class="details table">
         <xsl:if test="./location and $setLocation = 'true'">
@@ -408,11 +420,18 @@
         <xsl:with-param name="default" select="'0'"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'Event'"/>
+        <xsl:with-param name="setting" select="'listView/setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:variable name="setMoreButton">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'Event'"/>
         <xsl:with-param name="setting" select="'listView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
@@ -499,6 +518,30 @@
       </div>
     </xsl:if>
 
+    <xsl:if test="$setImage = 'true' and nav:attribute[@name='imageAttachments.image.id']">
+      <a>
+        <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
+        <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">
@@ -528,26 +571,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(nav:attribute[@name='lead'], 1, $setLeadTextLength)" />
             <xsl:if test="string-length(nav:attribute[@name='lead']) > $setLeadTextLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="nav:path"/>
                   <xsl:with-param name="module" select="'Event'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'Event'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="nav:path"/>
+            <xsl:with-param name="module" select="'Event'"/>
+          </xsl:call-template>
+        </xsl:if>
       </span>
     </xsl:if>
     <xsl:if test="$setDate = 'true' and ((nav:attribute[@name='startDate'] or nav:attribute[@name='endDate']) or nav:attribute[@name='eventDate'])">
@@ -612,7 +650,7 @@
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'Event'"/>
         <xsl:with-param name="setting" select="'linkView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
@@ -666,26 +704,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(./linkDescription, 1, $setDescriptionLength)" />
             <xsl:if test="string-length(./linkDescription) > $setDescriptionLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="./targetItem/@oid"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="./targetItem/@oid"/>
                   <xsl:with-param name="module" select="'Event'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'Event'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="./targetItem/@oid"/>
+            <xsl:with-param name="module" select="'Event'"/>
+          </xsl:call-template>
+        </xsl:if>
       </xsl:if>
     </xsl:if>
   </xsl:template>

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

@@ -27,12 +27,9 @@
   xmlns:mandalay="http://mandalay.quasiweb.de"
   version="1.0">
 
-  <!-- DE Vollansicht -->
-  <!-- EN Detailed view -->
-  <xsl:template name="CT_FAQItem_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.FAQItem']" mode="detailed_view">
-
-    <!-- DE Hole alle benötigten Einstellungen-->
-    <!-- EN Getting all needed setting-->
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.FAQItem']" mode="lead">
     <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'FAQItem'"/>
@@ -40,6 +37,20 @@
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
+
+    <xsl:if test="./question and $setLeadText = 'true'">
+      <div id="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./question"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.FAQItem']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
     <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'FAQItem'"/>
@@ -69,13 +80,6 @@
       </xsl:call-template>
     </xsl:variable>
 
-    <div id="greeting">
-      <xsl:if test="./question">
-        <div id="lead">
-          <xsl:value-of disable-output-escaping="yes" select="./question"/>
-        </div>
-      </xsl:if>
-    </div>
     <xsl:if test="$setImage = 'true'">
       <xsl:call-template name="mandalay:imageAttachment">
         <xsl:with-param name="showCaption" select="$setImageCaption"/>
@@ -83,7 +87,14 @@
         <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
       </xsl:call-template>
     </xsl:if>
+  </xsl:template>
 
+  <!-- DE Vollansicht -->
+  <!-- EN Detailed view -->
+  <xsl:template name="CT_FAQItem_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.FAQItem']" mode="detailed_view">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
     <xsl:if test="./answer">
       <div id="mainBody">
         <xsl:value-of disable-output-escaping="yes" select="./answer"/>
@@ -120,14 +131,45 @@
         <xsl:with-param name="default" select="'0'"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'FAQItem'"/>
+        <xsl:with-param name="setting" select="'listView/setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:variable name="setMoreButton">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'FAQItem'"/>
         <xsl:with-param name="setting" select="'listView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
+    <xsl:if test="$setImage = 'true' and nav:attribute[@name='imageAttachments.image.id']">
+      <a>
+        <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
+        <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>
+
     <xsl:choose>
       <xsl:when test="$setLinkToDetails = 'true' or $setLeadText = 'false' or (string-length(nav:attribute[@name='lead']) > $setLeadTextLength and $setLeadTextLength != '0') or not(nav:attribute[@name='question'])">
         <a class="CIname">
@@ -163,26 +205,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(nav:attribute[@name='lead'], 1, $setLeadTextLength)" />
             <xsl:if test="string-length(nav:attribute[@name='lead']) > $setLeadTextLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="nav:path"/>
                   <xsl:with-param name="module" select="'FAQItem'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'FAQItem'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="nav:path"/>
+            <xsl:with-param name="module" select="'FAQItem'"/>
+          </xsl:call-template>
+        </xsl:if>
       </span>
     </xsl:if>
   </xsl:template>
@@ -251,7 +288,7 @@
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'FAQItem'"/>
         <xsl:with-param name="setting" select="'linkView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
@@ -330,26 +367,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(./linkDescription, 1, $setDescriptionLength)" />
             <xsl:if test="string-length(./linkDescription) > $setDescriptionLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="./targetItem/@oid"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+                <xsl:if test="$setMoreButton = 'auto'">
+                  <xsl:call-template name="mandalay:moreButton">
+                    <xsl:with-param name="href" select="./targetItem/@oid"/>
                     <xsl:with-param name="module" select="'FAQItem'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                   </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'FAQItem'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
                 </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="./targetItem/@oid"/>
+            <xsl:with-param name="module" select="'FAQITem'"/>
+          </xsl:call-template>
+        </xsl:if>
       </xsl:if>
     </xsl:if>
   </xsl:template>

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

@@ -29,19 +29,31 @@
   exclude-result-prefixes="xsl bebop cms nav"
   version="1.0">
 
-  <!-- DE Vollansicht -->
-  <!-- EN Detailed view -->
-  <xsl:template name="CT_FileStorageItem_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.FileStorageItem']" mode="detailed_view">
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.FileStorageItem']" mode="lead">
+    <xsl:variable name="setLeadText">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'FileStorageItem'"/>
+        <xsl:with-param name="setting" select="'setLeadText'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="./description and $setLeadText = 'true'">
+      <div id="mainBody">
+        <xsl:value-of disable-output-escaping="yes" select="./description"/>
+        <div class="endFloat"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.FileStorageItem']" mode="image">
 
     <!-- DE Hole alle benötigten Einstellungen-->
     <!-- EN Getting all needed setting-->
-    <xsl:variable name="separator">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'FileStorageItem'"/>
-        <xsl:with-param name="setting" select="'separator'"/>
-        <xsl:with-param name="default" select="' | '"/>
-      </xsl:call-template>
-    </xsl:variable>
     <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'FileStorageItem'"/>
@@ -70,6 +82,29 @@
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
+
+    <xsl:if test="$setImage = 'true'">
+      <xsl:call-template name="mandalay:imageAttachment">
+        <xsl:with-param name="showCaption" select="$setImageCaption"/>
+        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Vollansicht -->
+  <!-- EN Detailed view -->
+  <xsl:template name="CT_FileStorageItem_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.FileStorageItem']" mode="detailed_view">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="separator">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'FileStorageItem'"/>
+        <xsl:with-param name="setting" select="'separator'"/>
+        <xsl:with-param name="default" select="' | '"/>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:variable name="setViewLink">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'FileStorageItem'"/>
@@ -92,21 +127,6 @@
       </xsl:call-template>
     </xsl:variable>
     
-    <div id="greeting">
-      <xsl:if test="$setImage = 'true'">
-        <xsl:call-template name="mandalay:imageAttachment">
-          <xsl:with-param name="showCaption" select="$setImageCaption" />
-          <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
-          <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
-        </xsl:call-template>
-      </xsl:if>
-      <xsl:if test="./description">
-        <div id="mainBody">
-          <xsl:value-of disable-output-escaping="yes" select="./description"/>
-          <div class="endFloat"/>
-        </div>
-      </xsl:if>
-    </div>
     <div class="fsiAction">
       <xsl:if test="$setViewLink = 'true'">
         <a class="show">
@@ -185,14 +205,45 @@
         <xsl:with-param name="default" select="'0'"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'FileStorageItem'"/>
+        <xsl:with-param name="setting" select="'listView/setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:variable name="setMoreButton">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'FileStorageItem'"/>
         <xsl:with-param name="setting" select="'listView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
+    <xsl:if test="$setImage = 'true' and nav:attribute[@name='imageAttachments.image.id']">
+      <a>
+        <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
+        <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">
@@ -221,26 +272,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(nav:attribute[@name='description'], 0, $setDescriptionLength)" />
             <xsl:if test="string-length(nav:attribute[@name='description']) > $setDescriptionLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="nav:path"/>
                   <xsl:with-param name="module" select="'FileStorageItem'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'FileStorageItem'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="nav:path"/>
+            <xsl:with-param name="module" select="'FileStorageItem'"/>
+          </xsl:call-template>
+        </xsl:if>
       </span>
     </xsl:if>
   </xsl:template>
@@ -302,7 +348,7 @@
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'FileStorageItem'"/>
         <xsl:with-param name="setting" select="'linkView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
@@ -356,26 +402,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(./linkDescription, 1, $setDescriptionLength)" />
             <xsl:if test="string-length(./linkDescription) > $setDescriptionLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="./targetItem/@oid"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+                <xsl:if test="$setMoreButton = 'auto'">
+                  <xsl:call-template name="mandalay:moreButton">
+                    <xsl:with-param name="href" select="./targetItem/@oid"/>
                     <xsl:with-param name="module" select="'FileStorageItem'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                   </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'FileStorageItem'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
                 </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="./targetItem/@oid"/>
+            <xsl:with-param name="module" select="'FileStorageItem'"/>
+          </xsl:call-template>
+        </xsl:if>
       </xsl:if>
     </xsl:if>
   </xsl:template>

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

@@ -43,9 +43,27 @@
   exclude-result-prefixes="xsl bebop cms"
   version="1.0">
 
-  <!-- DE Vollansicht -->
-  <!-- EN Detailed view -->
-  <xsl:template name="CT_Form_graphics" match="cms:item[objectType='com.arsdigita.cms.formbuilder.FormItem']" mode="detailed_view">
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.formbuilder.FormItem']" mode="lead">
+    <xsl:variable name="setLeadText">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'Form'"/>
+        <xsl:with-param name="setting" select="'setLeadText'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="./form/description and $setLeadText = 'true'">
+      <div id="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./form/description"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.formbuilder.FormItem']" mode="image">
 
     <!-- DE Hole alle benötigten Einstellungen-->
     <!-- EN Getting all needed setting-->
@@ -77,21 +95,7 @@
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="setLeadText">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'Form'"/>
-        <xsl:with-param name="setting" select="'setLeadText'"/>
-        <xsl:with-param name="default" select="'true'"/>
-      </xsl:call-template>
-    </xsl:variable>
 
-    <div id="greeting">
-      <xsl:if test="./form/description">
-        <div id="lead">
-          <xsl:value-of disable-output-escaping="yes" select="./form/description"/>
-        </div>
-      </xsl:if>
-    </div>
     <xsl:if test="$setImage = 'true'">
       <xsl:call-template name="mandalay:imageAttachment">
         <xsl:with-param name="showCaption" select="$setImageCaption"/>
@@ -99,10 +103,13 @@
         <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
       </xsl:call-template>
     </xsl:if>
+  </xsl:template>
+
+  <!-- DE Vollansicht -->
+  <!-- EN Detailed view -->
+  <xsl:template name="CT_Form_graphics" match="cms:item[objectType='com.arsdigita.cms.formbuilder.FormItem']" mode="detailed_view">
 
     <div id="mainBody">
-      <xsl:value-of disable-output-escaping="yes" select="./definition"/>
-
       <form>
         <xsl:attribute name="method">post</xsl:attribute>
         <xsl:attribute name="name"><xsl:value-of select="./name"/></xsl:attribute>
@@ -192,14 +199,45 @@
         <xsl:with-param name="default" select="'0'"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'Form'"/>
+        <xsl:with-param name="setting" select="'listView/setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:variable name="setMoreButton">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'Form'"/>
         <xsl:with-param name="setting" select="'listView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
+    <xsl:if test="$setImage = 'true' and nav:attribute[@name='imageAttachments.image.id']">
+      <a>
+        <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
+        <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">
@@ -228,26 +266,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(nav:attribute[@name='lead'], 1, $setLeadTextLength)" />
             <xsl:if test="string-length(nav:attribute[@name='lead']) > $setLeadTextLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="nav:path"/>
                   <xsl:with-param name="module" select="'Form'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'Form'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="nav:path"/>
+            <xsl:with-param name="module" select="'Form'"/>
+          </xsl:call-template>
+        </xsl:if>
       </span>
     </xsl:if>
   </xsl:template>
@@ -309,7 +342,7 @@
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'Form'"/>
         <xsl:with-param name="setting" select="'linkView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
@@ -363,26 +396,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(./linkDescription, 1, $setDescriptionLength)" />
             <xsl:if test="string-length(./linkDescription) > $setDescriptionLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="./targetItem/@oid"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="./targetItem/@oid"/>
                   <xsl:with-param name="module" select="'Form'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'Form'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="./targetItem/@oid"/>
+            <xsl:with-param name="module" select="'Form'"/>
+          </xsl:call-template>
+        </xsl:if>
       </xsl:if>
     </xsl:if>
   </xsl:template>

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

@@ -29,19 +29,9 @@
 	exclude-result-prefixes="xsl bebop cms"
 	version="1.0">
 
-  <!-- DE Vollansicht -->
-  <!-- EN Detailed view -->
-  <xsl:template name="CT_GenericAddress_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.GenericAddress']" mode="detailed_view">
-
-    <!-- DE Hole alle benötigten Einstellungen-->
-    <!-- EN Getting all needed setting-->
-    <xsl:variable name="setShowKeys">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'GenericAddress'"/>
-        <xsl:with-param name="setting" select="'setShowKeys'"/>
-        <xsl:with-param name="default" select="'true'"/>
-      </xsl:call-template>
-    </xsl:variable>
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.GenericAddress']" mode="lead">
     <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'GenericAddress'"/>
@@ -49,6 +39,31 @@
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setShowKeys">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'GenericAddress'"/>
+        <xsl:with-param name="setting" select="'setShowKeys'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="./lead and $setLeadText = 'true'">
+      <xsl:call-template name="CT_GenericAddress_details">
+        <xsl:with-param name="setShowKeys" select="$setShowKeys"/>
+      </xsl:call-template>
+
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./lead"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.GenericAddress']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
     <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'GenericAddress'"/>
@@ -78,17 +93,6 @@
       </xsl:call-template>
     </xsl:variable>
 
-    <div id="greeting">
-      <xsl:call-template name="CT_GenericAddress_details">
-        <xsl:with-param name="setShowKeys" select="$setShowKeys"/>
-      </xsl:call-template>
-      
-      <xsl:if test="./lead and $setLeadText = 'true'">
-        <div id="lead">
-          <xsl:value-of disable-output-escaping="yes" select="./lead"/>
-        </div>
-      </xsl:if>
-    </div>
     <xsl:if test="$setImage = 'true'">
       <xsl:call-template name="mandalay:imageAttachment">
         <xsl:with-param name="showCaption" select="$setImageCaption"/>
@@ -96,6 +100,21 @@
         <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
       </xsl:call-template>
     </xsl:if>
+  </xsl:template>
+
+  <!-- DE Vollansicht -->
+  <!-- EN Detailed view -->
+  <xsl:template name="CT_GenericAddress_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.GenericAddress']" mode="detailed_view">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setShowKeys">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'GenericAddress'"/>
+        <xsl:with-param name="setting" select="'setShowKeys'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
 
     <div id="mainBody">
       <xsl:call-template name="CT_GenericAddress_details">
@@ -129,14 +148,45 @@
         <xsl:with-param name="default" select="'0'"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'GenericAddress'"/>
+        <xsl:with-param name="setting" select="'listView/setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:variable name="setMoreButton">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'GenericAddress'"/>
         <xsl:with-param name="setting" select="'listView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
+    <xsl:if test="$setImage = 'true' and nav:attribute[@name='imageAttachments.image.id']">
+      <a>
+        <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
+        <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">
@@ -165,26 +215,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(nav:attribute[@name='lead'], 1, $setLeadTextLength)" />
             <xsl:if test="string-length(nav:attribute[@name='lead']) > $setLeadTextLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="nav:path"/>
                   <xsl:with-param name="module" select="'GenericAddress'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'GenericAddress'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="nav:path"/>
+            <xsl:with-param name="module" select="'GenericAddress'"/>
+          </xsl:call-template>
+        </xsl:if>
       </span>
     </xsl:if>
   </xsl:template>
@@ -246,7 +291,7 @@
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'GenericAddress'"/>
         <xsl:with-param name="setting" select="'linkView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
@@ -300,26 +345,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(./linkDescription, 1, $setDescriptionLength)" />
             <xsl:if test="string-length(./linkDescription) > $setDescriptionLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="./targetItem/@oid"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="./targetItem/@oid"/>
                   <xsl:with-param name="module" select="'GenericAddress'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'GenericAddress'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="./targetItem/@oid"/>
+            <xsl:with-param name="module" select="'GenericAddress'"/>
+          </xsl:call-template>
+        </xsl:if>
       </xsl:if>
     </xsl:if>
   </xsl:template>

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

@@ -27,12 +27,16 @@
   xmlns:mandalay="http://mandalay.quasiweb.de"
   exclude-result-prefixes="xsl bebop cms" version="1.0">
 
-  <!-- DE Vollansicht -->
-  <!-- EN Detailed view -->
-  <xsl:template name="CT_GenericContact_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.GenericContact']" mode="detailed_view">
-
-    <!-- DE Hole alle benötigten Einstellungen-->
-    <!-- EN Getting all needed setting-->
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.GenericContact']" mode="lead">
+    <xsl:variable name="setLeadText">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'GenericContact'"/>
+        <xsl:with-param name="setting" select="'setLeadText'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:variable name="setFullname">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module" select="'GenericContact'"/>
@@ -82,13 +86,30 @@
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="setLeadText">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'GenericContact'"/>
-        <xsl:with-param name="setting" select="'setLeadText'"/>
-        <xsl:with-param name="default" select="'true'"/>
+
+    <xsl:call-template name="CT_GenericContact_details">
+      <xsl:with-param name="setFullname" select="$setFullname"/>
+      <xsl:with-param name="setNameDetails" select="$setNameDetails"/>
+      <xsl:with-param name="setGender" select="$setGender"/>
+      <xsl:with-param name="setBirthdate" select="$setBirthdate"/>
+      <xsl:with-param name="setAddressHeader" select="$setAddressHeader"/>
+      <xsl:with-param name="setShowKeys" select="$setShowKeys"/>
+      <xsl:with-param name="setContactEntriesHeader" select="$setContactEntriesHeader"/>
     </xsl:call-template>
-    </xsl:variable>
+
+    <xsl:if test="./lead and $setLeadText = 'true'">
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./lead"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.GenericContact']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
     <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'GenericContact'"/>
@@ -118,23 +139,6 @@
       </xsl:call-template>
     </xsl:variable>
 
-    <div id="greeting">
-      <xsl:call-template name="CT_GenericContact_details">
-        <xsl:with-param name="setFullname" select="$setFullname"/>
-        <xsl:with-param name="setNameDetails" select="$setNameDetails"/>
-        <xsl:with-param name="setGender" select="$setGender"/>
-        <xsl:with-param name="setBirthdate" select="$setBirthdate"/>
-        <xsl:with-param name="setAddressHeader" select="$setAddressHeader"/>
-        <xsl:with-param name="setShowKeys" select="$setShowKeys"/>
-        <xsl:with-param name="setContactEntriesHeader" select="$setContactEntriesHeader"/>
-      </xsl:call-template>
-
-      <xsl:if test="./lead and $setLeadText = 'true'">
-        <div id="lead">
-          <xsl:value-of disable-output-escaping="yes" select="./lead"/>
-        </div>
-      </xsl:if>
-    </div>
     <xsl:if test="$setImage = 'true'">
       <xsl:call-template name="mandalay:imageAttachment">
         <xsl:with-param name="showCaption" select="$setImageCaption"/>
@@ -142,6 +146,14 @@
         <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
       </xsl:call-template>
     </xsl:if>
+  </xsl:template>
+
+  <!-- DE Vollansicht -->
+  <!-- EN Detailed view -->
+  <xsl:template name="CT_GenericContact_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.GenericContact']" mode="detailed_view">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
 
     <xsl:if test="./textAsset/content">
       <div id="mainBody">
@@ -174,14 +186,45 @@
         <xsl:with-param name="default" select="'0'"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'GenericContact'"/>
+        <xsl:with-param name="setting" select="'listView/setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:variable name="setMoreButton">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'GenericContact'"/>
         <xsl:with-param name="setting" select="'listView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
+    <xsl:if test="$setImage = 'true' and nav:attribute[@name='imageAttachments.image.id']">
+      <a>
+        <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
+        <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"/>
@@ -213,28 +256,21 @@
               select="substring(nav:attribute[@name='lead'], 1, $setLeadTextLength)"/>
             <xsl:if test="string-length(nav:attribute[@name='lead']) > $setLeadTextLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href">
-                      <xsl:value-of select="nav:path"/>
-                    </xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="nav:path"/>
                   <xsl:with-param name="module" select="'GenericContact'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'GenericContact'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a>
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="nav:path"/>
+            <xsl:with-param name="module" select="'GenericContact'"/>
+          </xsl:call-template>
+        </xsl:if>
       </span>
     </xsl:if>
   </xsl:template>
@@ -296,7 +332,7 @@
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module" select="'GenericContact'"/>
         <xsl:with-param name="setting" select="'linkView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
@@ -358,29 +394,21 @@
               select="substring(./linkDescription, 1, $setDescriptionLength)"/>
             <xsl:if test="string-length(./linkDescription) > $setDescriptionLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href">
-                      <xsl:text>/redirect/?oid=</xsl:text>
-                      <xsl:value-of select="./targetItem/@oid"/>
-                    </xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="./targetItem/@oid"/>
                   <xsl:with-param name="module" select="'GenericContact'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'GenericContact'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a>
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="./targetItem/@oid"/>
+            <xsl:with-param name="module" select="'GenericContact'"/>
+          </xsl:call-template>
+        </xsl:if>
       </xsl:if>
     </xsl:if>
   </xsl:template>

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

@@ -28,14 +28,27 @@
 		  exclude-result-prefixes="xsl bebop cms nav"
 		  version="1.0">
   
-   <!-- DE Importiere wichtige Funktionen -->
-  <!-- EN Using some includes -->
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template name="CT_GenericOrganizationalUnit_lead" match="cms:item[objectType='com.arsdigita.cms.contenttypes.GenericOrganizationalUnit']" mode="lead">
+    <xsl:variable name="setLeadText">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'GenericOrganizationalUnit'"/>
+        <xsl:with-param name="setting" select="'setLeadText'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
 
-  <!-- DE Vollansicht -->
-  <!-- EN Detailed view -->
-  <xsl:template name="CT_GenericOrganizationalUnit_graphics" 
-		match="cms:item[objectType='com.arsdigita.cms.contenttypes.GenericOrganizationalUnit']"
-		mode="detailed_view">
+    <xsl:if test="./lead and $setLeadText = 'true'">
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./lead"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template name="CT_GenericOrganizationalUnit_image" match="cms:item[objectType='com.arsdigita.cms.contenttypes.GenericOrganizationalUnit']" mode="image">
 
     <!-- DE Hole alle benötigten Einstellungen-->
     <!-- EN Getting all needed setting-->
@@ -46,13 +59,6 @@
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="setImageCaption">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'GenericOrganizationalUnit'"/>
-        <xsl:with-param name="setting" select="'setImageCaption'"/>
-        <xsl:with-param name="default" select="'true'"/>
-      </xsl:call-template>
-    </xsl:variable>
     <xsl:variable name="setImageMaxHeight">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'GenericOrganizationalUnit'"/>
@@ -67,7 +73,31 @@
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImageCaption">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'GenericOrganizationalUnit'"/>
+        <xsl:with-param name="setting" select="'setImageCaption'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
 
+    <xsl:if test="$setImage = 'true'">
+      <xsl:call-template name="mandalay:imageAttachment">
+        <xsl:with-param name="showCaption" select="$setImageCaption"/>
+        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Vollansicht -->
+  <!-- EN Detailed view -->
+  <xsl:template name="CT_GenericOrganizationalUnit_graphics" 
+		match="cms:item[objectType='com.arsdigita.cms.contenttypes.GenericOrganizationalUnit']"
+		mode="detailed_view">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
     <xsl:variable name="setAddendum">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'GenericOrganizationalUnit'"/>
@@ -105,14 +135,6 @@
     </xsl:variable>
 
     <div class="genericOrganizationalUnitDetails">
-      <xsl:if test="$setImage = 'true'">
-        <xsl:call-template name="mandalay:imageAttachment">
-          <xsl:with-param name="showCaption" select="$setImageCaption" />
-          <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
-          <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
-        </xsl:call-template>
-      </xsl:if>
-      
       <xsl:if test="($setAddendum = 'true') and (string-length(./addendum) &gt; 0)">
         <div class="addendum">
           <xsl:value-of select="./addendum"/>
@@ -212,14 +234,45 @@
         <xsl:with-param name="default" select="'0'"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'GenericOrganizationalUnit'"/>
+        <xsl:with-param name="setting" select="'listView/setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:variable name="setMoreButton">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'GenericOrganizationalUnit'"/>
         <xsl:with-param name="setting" select="'listView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
+    <xsl:if test="$setImage = 'true' and nav:attribute[@name='imageAttachments.image.id']">
+      <a>
+        <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
+        <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>
+
     <xsl:choose>
       <xsl:when test="$setLinkToDetails = 'true' or (string-length(nav:attribute[@name='lead']) > $setLeadTextLength and $setLeadTextLength != '0')">
         <a class="CIname">
@@ -256,25 +309,20 @@
             <xsl:if test="string-length(nav:attribute[@name='lead']) > $setLeadTextLength">
               <xsl:text>...</xsl:text>
               <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="nav:path"/>
                   <xsl:with-param name="module" select="'GenericOrganizationalUnit'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'GenericOrganizationalUnit'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="nav:path"/>
+            <xsl:with-param name="module" select="'GenericOrganizationalUnit'"/>
+          </xsl:call-template>
+        </xsl:if>
       </span>
     </xsl:if>    
 
@@ -344,7 +392,7 @@
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'GenericOrganizationalUnit'"/>
         <xsl:with-param name="setting" select="'linkView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
@@ -423,26 +471,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(./linkDescription, 1, $setDescriptionLength)" />
             <xsl:if test="string-length(./linkDescription) > $setDescriptionLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="./targetItem/@oid"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="./targetItem/@oid"/>
                   <xsl:with-param name="module" select="'GenericOrganizationalUnit'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'GenericOrganizationalUnit'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="./targetItem/@oid"/>
+            <xsl:with-param name="module" select="'GenericOrganizationalUnit'"/>
+          </xsl:call-template>
+        </xsl:if>
       </xsl:if>
     </xsl:if>
   </xsl:template>

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

@@ -29,6 +29,68 @@
 	exclude-result-prefixes="xsl bebop cms"
 	version="1.0">
 
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.GenericPerson']" mode="lead">
+    <xsl:variable name="setLeadText">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'GenericPerson'"/>
+        <xsl:with-param name="setting" select="'setLeadText'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="./pageDescription and $setLeadText = 'true'">
+      <div id="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./pageDescription"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.GenericPerson']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'GenericPerson'"/>
+        <xsl:with-param name="setting" select="'setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageMaxHeight">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'GenericPerson'"/>
+        <xsl:with-param name="setting" select="'setImageMaxHeight'"/>
+        <xsl:with-param name="default" select="''"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageMaxWidth">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'GenericPerson'"/>
+        <xsl:with-param name="setting" select="'setImageMaxWidth'"/>
+        <xsl:with-param name="default" select="''"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageCaption">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'GenericPerson'"/>
+        <xsl:with-param name="setting" select="'setImageCaption'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="$setImage = 'true'">
+      <xsl:call-template name="mandalay:imageAttachment">
+        <xsl:with-param name="showCaption" select="$setImageCaption"/>
+        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
   <!-- DE Vollansicht -->
   <!-- EN Detailed view -->
   <xsl:template name="CT_GenericPerson_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.GenericPerson']" mode="detailed_view">
@@ -63,62 +125,13 @@
         <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="module"  select="'GenericPerson'"/>
-        <xsl:with-param name="setting" select="'setDescription'"/>
-        <xsl:with-param name="default" select="'true'"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="setImage">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'GenericPerson'"/>
-        <xsl:with-param name="setting" select="'setImage'"/>
-        <xsl:with-param name="default" select="'true'"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="setImageMaxHeight">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'GenericPerson'"/>
-        <xsl:with-param name="setting" select="'setImageMaxHeight'"/>
-        <xsl:with-param name="default" select="''"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="setImageMaxWidth">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'GenericPerson'"/>
-        <xsl:with-param name="setting" select="'setImageMaxWidth'"/>
-        <xsl:with-param name="default" select="''"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="setImageCaption">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'GenericPerson'"/>
-        <xsl:with-param name="setting" select="'setImageCaption'"/>
-        <xsl:with-param name="default" select="'true'"/>
-      </xsl:call-template>
-    </xsl:variable>
 
-    <div id="greeting">
     <xsl:call-template name="CT_GenericPerson_details">
       <xsl:with-param name="setNameDetails" select="$setNameDetails"/>
       <xsl:with-param name="setGender" select="$setGender"/>
       <xsl:with-param name="setBirthdate" select="$setBirthdate"/>
     </xsl:call-template>
 
-      <xsl:if test="./pageDescription and $setDescription = 'true'">
-        <div id="lead">
-          <xsl:value-of disable-output-escaping="yes" select="./pageDescription"/>
-        </div>
-      </xsl:if>
-    </div>
-    <xsl:if test="$setImage = 'true'">
-      <xsl:call-template name="mandalay:imageAttachment">
-        <xsl:with-param name="showCaption" select="$setImageCaption"/>
-        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
-        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
-      </xsl:call-template>
-    </xsl:if>
     <div class="endFloat"/>
   </xsl:template>
 
@@ -142,14 +155,45 @@
         <xsl:with-param name="default" select="'0'"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'GenericPerson'"/>
+        <xsl:with-param name="setting" select="'listView/setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:variable name="setMoreButton">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'GenericPerson'"/>
         <xsl:with-param name="setting" select="'listView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
+    <xsl:if test="$setImage = 'true' and nav:attribute[@name='imageAttachments.image.id']">
+      <a>
+        <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
+        <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">
@@ -259,7 +303,7 @@
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'GenericPerson'"/>
         <xsl:with-param name="setting" select="'linkView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
@@ -313,26 +357,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(./linkDescription, 1, $setDescriptionLength)" />
             <xsl:if test="string-length(./linkDescription) > $setDescriptionLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="./targetItem/@oid"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="./targetItem/@oid"/>
                   <xsl:with-param name="module" select="'GenericPerson'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'GenericPerson'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="./targetItem/@oid"/>
+            <xsl:with-param name="module" select="'GenericPerson'"/>
+          </xsl:call-template>
+        </xsl:if>
       </xsl:if>
     </xsl:if>
   </xsl:template>

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

@@ -27,9 +27,27 @@
   xmlns:mandalay="http://mandalay.quasiweb.de"
   version="1.0">
 
-  <!-- DE Vollansicht -->
-  <!-- EN Detailed view -->
-  <xsl:template name="CT_GlossaryItem_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.GlossaryItem']" mode="detailed_view">
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.GlossaryItem']" mode="lead">
+    <xsl:variable name="setLeadText">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'GlossaryItem'"/>
+        <xsl:with-param name="setting" select="'setLeadText'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="./title and $setLeadText = 'true'">
+      <div id="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./title"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.GlossaryItem']" mode="image">
 
     <!-- DE Hole alle benötigten Einstellungen-->
     <!-- EN Getting all needed setting-->
@@ -62,13 +80,6 @@
       </xsl:call-template>
     </xsl:variable>
 
-    <div id="greeting">
-      <xsl:if test="./title">
-        <div id="lead">
-          <xsl:value-of disable-output-escaping="yes" select="./title"/>
-        </div>
-      </xsl:if>
-    </div>
     <xsl:if test="$setImage = 'true'">
       <xsl:call-template name="mandalay:imageAttachment">
         <xsl:with-param name="showCaption" select="$setImageCaption"/>
@@ -76,6 +87,14 @@
         <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
       </xsl:call-template>
     </xsl:if>
+  </xsl:template>
+
+  <!-- DE Vollansicht -->
+  <!-- EN Detailed view -->
+  <xsl:template name="CT_GlossaryItem_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.GlossaryItem']" mode="detailed_view">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
 
     <xsl:if test="./definition">
       <div id="mainBody">
@@ -113,14 +132,45 @@
         <xsl:with-param name="default" select="'0'"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'GlossaryItem'"/>
+        <xsl:with-param name="setting" select="'listView/setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:variable name="setMoreButton">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'GlossaryItem'"/>
         <xsl:with-param name="setting" select="'listView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
+    <xsl:if test="$setImage = 'true' and nav:attribute[@name='imageAttachments.image.id']">
+      <a>
+        <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
+        <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>
+
     <xsl:choose>
       <xsl:when test="$setLinkToDetails = 'true' or $setDefinition = 'false' or (string-length(nav:attribute[@name='definition']) > $setDefinitionLength and $setDefinitionLength != '0') or not(nav:attribute[@name='definition'])">
         <a class="CIname">
@@ -156,26 +206,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(nav:attribute[@name='definition'], 1, $setDefinitionLength)" />
             <xsl:if test="string-length(nav:attribute[@name='definition']) > $setDefinitionLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="nav:path"/>
                   <xsl:with-param name="module" select="'GlossaryItem'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'GlossaryItem'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="nav:path"/>
+            <xsl:with-param name="module" select="'GlossaryItem'"/>
+          </xsl:call-template>
+        </xsl:if>
       </span>
     </xsl:if>
   </xsl:template>
@@ -244,7 +289,7 @@
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'GlossaryItem'"/>
         <xsl:with-param name="setting" select="'linkView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
@@ -323,26 +368,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(./linkDescription, 1, $setDescriptionLength)" />
             <xsl:if test="string-length(./linkDescription) > $setDescriptionLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="./targetItem/@oid"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="./targetItem/@oid"/>
                   <xsl:with-param name="module" select="'GlossaryItem'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'GlossaryItem'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="./targetItem/@oid"/>
+            <xsl:with-param name="module" select="'GlossaryItem'"/>
+          </xsl:call-template>
+        </xsl:if>
       </xsl:if>
     </xsl:if>
   </xsl:template>

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

@@ -27,13 +27,9 @@
   xmlns:mandalay="http://mandalay.quasiweb.de"
   exclude-result-prefixes="xsl bebop cms" version="1.0">
   
-  <!-- DE Vollansicht -->
-  <!-- EN Detailed view -->
-  <xsl:template name="CT_Image_graphics"
-    match="cms:item[objectType='com.arsdigita.cms.contenttypes.Image']" mode="detailed_view">
-    
-    <!-- DE Hole alle benötigten Einstellungen-->
-    <!-- EN Getting all needed setting-->
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Image']" mode="lead">
     <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'Image'"/>
@@ -41,6 +37,27 @@
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
+
+    <xsl:if test="./description and $setLeadText = 'true'">
+      <div id="lead">
+        <xsl:variable name="description">
+          <xsl:call-template name="mandalay:string-replace">
+            <xsl:with-param name="string" select="./description"/>
+            <xsl:with-param name="from" select="'&#xA;'"/>
+            <xsl:with-param name="to" select="'&lt;br/>'"/>
+          </xsl:call-template>
+        </xsl:variable>
+        <xsl:value-of disable-output-escaping="yes" select="$description"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Image']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
     <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'Image'"/>
@@ -69,6 +86,25 @@
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
+
+    <xsl:if test="$setImage = 'true'">
+      <xsl:call-template name="mandalay:imageAttachment">
+        <xsl:with-param name="showCaption" select="$setImageCaption"/>
+        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+        <xsl:with-param name="setZoomLink" select="'true'"/>
+        <xsl:with-param name="node" select=". | ./imageAttachments"/>
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Vollansicht -->
+  <!-- EN Detailed view -->
+  <xsl:template name="CT_Image_graphics"
+    match="cms:item[objectType='com.arsdigita.cms.contenttypes.Image']" mode="detailed_view">
+    
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
     <xsl:variable name="setShowKeys">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module" select="'Image'"/>
@@ -84,31 +120,6 @@
       </xsl:call-template>
     </xsl:variable>
     
-    <div id="greeting">
-      <xsl:if test="$setImage = 'true'">
-        <xsl:call-template name="mandalay:imageAttachment">
-          <xsl:with-param name="showCaption" select="$setImageCaption"/>
-          <xsl:with-param name="maxWidth" select="$setImageMaxWidth"/>
-          <xsl:with-param name="maxHeight" select="$setImageMaxHeight"/>
-          <xsl:with-param name="setZoomLink" select="'true'"/>
-          <xsl:with-param name="node" select=". | ./imageAttachments"/>
-        </xsl:call-template>
-      </xsl:if>
-      
-      <xsl:if test="./description and $setLeadText = 'true'">
-        <div id="lead">
-          <xsl:variable name="description">
-            <xsl:call-template name="mandalay:string-replace">
-              <xsl:with-param name="string" select="./description"/>
-              <xsl:with-param name="from" select="'&#xA;'"/>
-              <xsl:with-param name="to" select="'&lt;br/>'"/>
-            </xsl:call-template>
-          </xsl:variable>
-          <xsl:value-of disable-output-escaping="yes" select="$description"/>
-        </div>
-      </xsl:if>
-    </div>
-    
     <div id="mainBody">
       <div class="details table">
         <xsl:if test="(image/width and image/height) or $setShowEmptyEntry = 'true'">
@@ -128,23 +139,6 @@
             </span>
           </div>
         </xsl:if>
-  <!--
-        <xsl:if test="caption or $setShowEmptyEntry = 'true'">
-          <div class="tableRow">
-            <xsl:if test="$setShowKeys='true'">
-              <span class="key">
-                <xsl:call-template name="mandalay:getStaticText">
-                  <xsl:with-param name="module" select="'Image'"/>
-                  <xsl:with-param name="id" select="'caption'"/>
-                </xsl:call-template>
-              </span>
-            </xsl:if>
-            <span class="value">
-              <xsl:value-of select="caption"/>
-            </span>
-          </div>
-        </xsl:if>
-  -->
         <xsl:if test="artist or $setShowEmptyEntry = 'true'">
           <div class="tableRow">
             <xsl:if test="$setShowKeys='true'">
@@ -349,13 +343,6 @@
         <xsl:with-param name="default" select="'0'"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="setMoreButton">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'Image'"/>
-        <xsl:with-param name="setting" select="'listView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
-      </xsl:call-template>
-    </xsl:variable>
     <xsl:variable name="setThumbnail">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module" select="'Image'"/>
@@ -377,6 +364,44 @@
         <xsl:with-param name="default" select="'false'"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'Image'"/>
+        <xsl:with-param name="setting" select="'listView/setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setMoreButton">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'Image'"/>
+        <xsl:with-param name="setting" select="'listView/setMoreButton'"/>
+        <xsl:with-param name="default" select="'auto'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="$setImage = 'true' and nav:attribute[@name='imageAttachments.image.id']">
+      <a>
+        <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
+        <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">
@@ -478,28 +503,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(nav:attribute[@name='description'], 1, $setLeadTextLength)"/>
             <xsl:if test="string-length(nav:attribute[@name='description']) > $setLeadTextLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href">
-                      <xsl:value-of select="nav:path"/>
-                    </xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="nav:path"/>
                   <xsl:with-param name="module" select="'Image'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'Image'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a>
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="nav:path"/>
+            <xsl:with-param name="module" select="'Image'"/>
+          </xsl:call-template>
+        </xsl:if>
       </span>
     </xsl:if>
   </xsl:template>
@@ -563,7 +581,7 @@
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module" select="'Image'"/>
         <xsl:with-param name="setting" select="'linkView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
     
@@ -625,29 +643,21 @@
               select="substring(./linkDescription, 1, $setDescriptionLength)"/>
             <xsl:if test="string-length(./linkDescription) > $setDescriptionLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href">
-                      <xsl:text>/redirect/?oid=</xsl:text>
-                      <xsl:value-of select="./targetItem/@oid"/>
-                    </xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
-                        <xsl:with-param name="module" select="'Image'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="./targetItem/@oid"/>
+                  <xsl:with-param name="module" select="'Imahe'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'Image'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a>
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="./targetItem/@oid"/>
+            <xsl:with-param name="module" select="'Image'"/>
+          </xsl:call-template>
+        </xsl:if>
       </xsl:if>
     </xsl:if>
   </xsl:template>

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

@@ -29,12 +29,16 @@
 	exclude-result-prefixes="xsl bebop cms"
 	version="1.0">
 
-  <!-- DE Vollansicht -->
-  <!-- EN Detailed view -->
-  <xsl:template name="CT_Member_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.Member']" mode="detailed_view">
-    
-    <!-- DE Hole alle benötigten Einstellungen-->
-    <!-- EN Getting all needed setting-->
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Member']" mode="lead">
+    <xsl:variable name="setLeadText">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'Member'"/>
+        <xsl:with-param name="setting" select="'setLeadText'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:variable name="setFullname">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'Member'"/>
@@ -63,13 +67,27 @@
         <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="module"  select="'Member'"/>
-        <xsl:with-param name="setting" select="'setDescription'"/>
-        <xsl:with-param name="default" select="'true'"/>
+
+    <xsl:call-template name="CT_GenericPerson_details">
+      <xsl:with-param name="setFullname" select="$setFullname"/>
+      <xsl:with-param name="setNameDetails" select="$setNameDetails"/>
+      <xsl:with-param name="setGender" select="$setGender"/>
+      <xsl:with-param name="setBirthdate" select="$setBirthdate"/>
     </xsl:call-template>
-    </xsl:variable>
+
+    <xsl:if test="./pageDescription and $setLeadText = 'true'">
+      <div id="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./pageDescription"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Member']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
     <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'Member'"/>
@@ -99,20 +117,21 @@
       </xsl:call-template>
     </xsl:variable>
 
-    <div id="greeting">
-      <xsl:call-template name="CT_GenericPerson_details">
-        <xsl:with-param name="setFullname" select="$setFullname"/>
-        <xsl:with-param name="setNameDetails" select="$setNameDetails"/>
-        <xsl:with-param name="setGender" select="$setGender"/>
-        <xsl:with-param name="setBirthdate" select="$setBirthdate"/>
+    <xsl:if test="$setImage = 'true'">
+      <xsl:call-template name="mandalay:imageAttachment">
+        <xsl:with-param name="showCaption" select="$setImageCaption"/>
+        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
       </xsl:call-template>
-
-      <xsl:if test="./pageDescription and $setDescription = 'true'">
-        <div id="lead">
-          <xsl:value-of disable-output-escaping="yes" select="./pageDescription"/>
-        </div>
     </xsl:if>
-    </div>
+  </xsl:template>
+
+  <!-- DE Vollansicht -->
+  <!-- EN Detailed view -->
+  <xsl:template name="CT_Member_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.Member']" mode="detailed_view">
+    
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
 
     <xsl:for-each select="./contacts">
       <xsl:call-template name="CT_GenericContact_details">
@@ -123,13 +142,6 @@
       </xsl:call-template>
     </xsl:for-each>
 
-    <xsl:if test="$setImage = 'true'">
-      <xsl:call-template name="mandalay:imageAttachment">
-        <xsl:with-param name="showCaption" select="$setImageCaption"/>
-        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
-        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
-      </xsl:call-template>
-    </xsl:if>
     <div class="endFloat"/>
   </xsl:template>
 
@@ -153,14 +165,45 @@
         <xsl:with-param name="default" select="'0'"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'Member'"/>
+        <xsl:with-param name="setting" select="'listView/setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:variable name="setMoreButton">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'Member'"/>
         <xsl:with-param name="setting" select="'listView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
+    <xsl:if test="$setImage = 'true' and nav:attribute[@name='imageAttachments.image.id']">
+      <a>
+        <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
+        <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">
@@ -189,26 +232,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(nav:attribute[@name='lead'], 1, $setLeadTextLength)" />
             <xsl:if test="string-length(nav:attribute[@name='lead']) > $setLeadTextLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="nav:path"/>
                   <xsl:with-param name="module" select="'Member'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'Member'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="nav:path"/>
+            <xsl:with-param name="module" select="'Member'"/>
+          </xsl:call-template>
+        </xsl:if>
       </span>
     </xsl:if>
   </xsl:template>
@@ -270,7 +308,7 @@
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'Member'"/>
         <xsl:with-param name="setting" select="'linkView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
@@ -324,26 +362,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(./linkDescription, 1, $setDescriptionLength)" />
             <xsl:if test="string-length(./linkDescription) > $setDescriptionLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="./targetItem/@oid"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="./targetItem/@oid"/>
                   <xsl:with-param name="module" select="'Member'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'Member'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="./targetItem/@oid"/>
+            <xsl:with-param name="module" select="'Member'"/>
+          </xsl:call-template>
+        </xsl:if>
       </xsl:if>
     </xsl:if>
   </xsl:template>

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

@@ -30,17 +30,14 @@
   exclude-result-prefixes="xsl bebop cms ui"
   version="1.0">
 
-  <!-- DE Vollansicht -->
-  <!-- EN Detailed view -->
-  <xsl:template name="CT_MultiPartArticle_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.MultiPartArticle']" mode="detailed_view">
-
-    <!-- DE Hole alle benötigten Einstellungen-->
-    <!-- EN Getting all needed setting-->
-    <xsl:variable name="separator">
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.MultiPartArticle']" mode="lead">
+    <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'MultiPartArticle'"/>
-        <xsl:with-param name="setting" select="'separator'"/>
-        <xsl:with-param name="default" select="' | '"/>
+        <xsl:with-param name="setting" select="'setLeadText'"/>
+        <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setSummary">
@@ -57,6 +54,76 @@
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
+
+    <!-- DE Berechne lokale Variablen -->
+    <!-- EN Calculate local variables -->
+    <xsl:variable name="currentRank" select="//cms:articleSectionPanel/cms:item/rank"/>
+    <xsl:variable name="currentPage" select="count(//cms:item/sections[pageBreak = 'true' and rank &lt; $currentRank]) + 1"/>
+
+    <xsl:if test="./summary and $setSummary = 'true' and ($currentPage = '1' or ($currentPage > '1' and $setSummaryFirstPageOnly = 'false'))">
+      <div id="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./summary"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.MultiPartArticle']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'MultiPartArticle'"/>
+        <xsl:with-param name="setting" select="'setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageMaxHeight">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'MultiPartArticle'"/>
+        <xsl:with-param name="setting" select="'setImageMaxHeight'"/>
+        <xsl:with-param name="default" select="''"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageMaxWidth">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'MultiPartArticle'"/>
+        <xsl:with-param name="setting" select="'setImageMaxWidth'"/>
+        <xsl:with-param name="default" select="''"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageCaption">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'MultiPartArticle'"/>
+        <xsl:with-param name="setting" select="'setImageCaption'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="$setImage = 'true'">
+      <xsl:call-template name="mandalay:imageAttachment">
+        <xsl:with-param name="showCaption" select="$setImageCaption"/>
+        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Vollansicht -->
+  <!-- EN Detailed view -->
+  <xsl:template name="CT_MultiPartArticle_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.MultiPartArticle']" mode="detailed_view">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="separator">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'MultiPartArticle'"/>
+        <xsl:with-param name="setting" select="'separator'"/>
+        <xsl:with-param name="default" select="' | '"/>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:variable name="setSectionListHeading">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'MultiPartArticle'"/>
@@ -70,13 +137,6 @@
     <xsl:variable name="currentRank" select="//cms:articleSectionPanel/cms:item/rank"/>
     <xsl:variable name="currentPage" select="count(//cms:item/sections[pageBreak = 'true' and rank &lt; $currentRank]) + 1"/>
 
-    <div id="greeting">
-      <xsl:if test="./summary and $setSummary = 'true' and ($currentPage = '1' or ($currentPage > '1' and $setSummaryFirstPageOnly = 'false'))">
-        <div id="lead">
-          <xsl:value-of disable-output-escaping="yes" select="./summary"/>
-        </div>
-      </xsl:if>
-    </div>
     <xsl:if test="count(./sections) > 1">
       <div class="sectionList">
         <xsl:if test="$setSectionListHeading = 'true'">
@@ -127,6 +187,13 @@
     </xsl:if>
   </xsl:template>
 
+
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.ArticleSection']" mode="lead">
+  </xsl:template>
+
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.ArticleSection']" mode="image">
+  </xsl:template>
+
   <!-- DE Vollansicht Text-Section -->
   <!-- EN Detailed view text section -->
   <xsl:template name="CT_MultiPartArticle_Section" match="cms:item[objectType='com.arsdigita.cms.contenttypes.ArticleSection']" mode="detailed_view">
@@ -310,14 +377,45 @@
         <xsl:with-param name="default" select="'0'"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'MultiPartArticle'"/>
+        <xsl:with-param name="setting" select="'listView/setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:variable name="setMoreButton">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'MultiPartArticle'"/>
         <xsl:with-param name="setting" select="'listView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
+    <xsl:if test="$setImage = 'true' and nav:attribute[@name='imageAttachments.image.id']">
+      <a>
+        <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
+        <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">
@@ -346,26 +444,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(nav:attribute[@name='summary'], 1, $setSummaryLength)" />
             <xsl:if test="string-length(nav:attribute[@name='summary']) > $setSummaryLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="nav:path"/>
                   <xsl:with-param name="module" select="'MultiPartArticle'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'MultiPartArticle'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="nav:path"/>
+            <xsl:with-param name="module" select="'MultiPartArticle'"/>
+          </xsl:call-template>
+        </xsl:if>
       </span>
     </xsl:if>
   </xsl:template>
@@ -427,7 +520,7 @@
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'MultiPartArticle'"/>
         <xsl:with-param name="setting" select="'linkView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
@@ -492,26 +585,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(./linkDescription, 1, $setDescriptionLength)" />
             <xsl:if test="string-length(./linkDescription) > $setDescriptionLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="./targetItem/@oid"/><xsl:value-of select="$params"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="./targetItem/@oid"/>
                   <xsl:with-param name="module" select="'MultiPartArticle'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'MultiPartArticle'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="./targetItem/@oid"/>
+            <xsl:with-param name="module" select="'MultiPartArticle'"/>
+          </xsl:call-template>
+        </xsl:if>
       </xsl:if>
     </xsl:if>
   </xsl:template>

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

@@ -29,19 +29,50 @@
 	exclude-result-prefixes="xsl bebop cms"
 	version="1.0">
 
-  <!-- DE Vollansicht -->
-  <!-- EN Detailed view -->
-  <xsl:template name="CT_NewsItem_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.NewsItem']" mode="detailed_view">
-
-    <!-- DE Hole alle benötigten Einstellungen-->
-    <!-- EN Getting all needed setting-->
-    <xsl:variable name="setNewsDate">
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.NewsItem']" mode="lead">
+    <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'NewsItem'"/>
-        <xsl:with-param name="setting" select="'setNewsDate'"/>
+        <xsl:with-param name="setting" select="'setLeadText'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setNewsDateBeforeLead">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'NewsItem'"/>
+        <xsl:with-param name="setting" select="'setNewsDateBeforeLead'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setNewsDateAfterLead">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'NewsItem'"/>
+        <xsl:with-param name="setting" select="'setNewsDateAfterLead'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="$setNewsDateBeforeLead = 'true'">
+      <xsl:apply-templates select="." mode="date"/>
+    </xsl:if>
+    <xsl:if test="./lead and $setLeadText = 'true'">
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./lead"/>
+      </div>
+    </xsl:if>
+    <xsl:if test="$setNewsDateAfterLead = 'true'">
+      <xsl:apply-templates select="." mode="date"/>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.NewsItem']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
     <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'NewsItem'"/>
@@ -70,32 +101,7 @@
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="setLeadText">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'NewsItem'"/>
-        <xsl:with-param name="setting" select="'setLeadText'"/>
-        <xsl:with-param name="default" select="'true'"/>
-      </xsl:call-template>
-    </xsl:variable>
 
-    <div id="greeting">
-      <xsl:if test="$setNewsDate = 'true'">
-        <div id="newsDate">
-          <xsl:value-of disable-output-escaping="yes" select="./newsDate/@date"/>
-        </div>
-      </xsl:if>
-      <xsl:if test="./lead and $setLeadText">
-        <div id="lead">
-          <xsl:value-of disable-output-escaping="yes" select="./lead"/>
-        </div>
-      </xsl:if>
-<!--
-      <xsl:if test="$setNewsDate = 'true'">
-        <div id="newsDate">
-          <xsl:value-of disable-output-escaping="yes" select="./newsDate/@date"/>
-        </div>
-      </xsl:if>
--->
     <xsl:if test="$setImage = 'true'">
       <xsl:call-template name="mandalay:imageAttachment">
         <xsl:with-param name="showCaption" select="$setImageCaption"/>
@@ -103,7 +109,20 @@
         <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
       </xsl:call-template>
     </xsl:if>
+  </xsl:template>
+
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.NewsItem']" mode="date">
+    <div id="newsDate">
+      <xsl:value-of disable-output-escaping="yes" select="./newsDate/@date"/>
     </div>
+  </xsl:template>
+
+  <!-- DE Vollansicht -->
+  <!-- EN Detailed view -->
+  <xsl:template name="CT_NewsItem_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.NewsItem']" mode="detailed_view">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
     <xsl:if test="./textAsset/content">
       <div id="mainBody">
         <xsl:value-of disable-output-escaping="yes" select="./textAsset/content"/>
@@ -154,11 +173,18 @@
         <xsl:with-param name="default" select="'0'"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'NewsItem'"/>
+        <xsl:with-param name="setting" select="'listView/setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:variable name="setMoreButton">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'NewsItem'"/>
         <xsl:with-param name="setting" select="'listView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
@@ -167,6 +193,31 @@
         <xsl:value-of select="nav:attribute[@name='newsDate']/@date"/>
       </div>
     </xsl:if>
+
+    <xsl:if test="$setImage = 'true' and nav:attribute[@name='imageAttachments.image.id']">
+      <a>
+        <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
+        <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>
+
     <xsl:choose>
       <xsl:when test="$setLinkToDetails = 'true' or (string-length(nav:attribute[@name='lead']) > $setLeadTextLength and $setLeadTextLength != '0')">
         <a class="CIname">
@@ -194,6 +245,18 @@
       </xsl:otherwise>
     </xsl:choose>
     <xsl:if test="nav:attribute[@name='lead'] and $setLeadText = 'true'">
+      <xsl:if test="nav:attribute[@name='imageAttachments.image.id']">
+        <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>
+      </xsl:if>
+
       <br />
       <span class="intro">
         <xsl:choose>
@@ -204,26 +267,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(nav:attribute[@name='lead'], 1, $setLeadTextLength)" />
             <xsl:if test="string-length(nav:attribute[@name='lead']) > $setLeadTextLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="nav:path"/>
                   <xsl:with-param name="module" select="'NewsItem'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'NewsItem'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="nav:path"/>
+            <xsl:with-param name="module" select="'NewsItem'"/>
+          </xsl:call-template>
+        </xsl:if>
       </span>
     </xsl:if>
     <xsl:if test="nav:attribute[@name='newsDate'] and $setNewsDate = 'true'">
@@ -295,7 +353,7 @@
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'NewsItem'"/>
         <xsl:with-param name="setting" select="'linkView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
@@ -374,26 +432,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(./linkDescription, 1, $setDescriptionLength)" />
             <xsl:if test="string-length(./linkDescription) > $setDescriptionLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="./targetItem/@oid"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="./targetItem/@oid"/>
                   <xsl:with-param name="module" select="'NewsItem'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'NewsItem'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="./targetItem/@oid"/>
+            <xsl:with-param name="module" select="'NewsItem'"/>
+          </xsl:call-template>
+        </xsl:if>
       </xsl:if>
     </xsl:if>
   </xsl:template>

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

@@ -30,113 +30,72 @@
   exclude-result-prefixes="xsl bebop cms nav"
   version="1.0">
 
-
-  <!-- DE Vollansicht -->
-  <!-- EN Detailed view -->
-  <xsl:template name="CT_Address_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.Address']" mode="detailed_view">
-
-    <!-- DE Hole alle benötigten Einstellungen-->
-    <!-- EN Getting all needed setting-->
-    <xsl:variable name="setImage">
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.OldAddress']" mode="lead">
+    <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'Address'"/>
-        <xsl:with-param name="setting" select="'setImage'"/>
+        <xsl:with-param name="module"  select="'OldAddress'"/>
+        <xsl:with-param name="setting" select="'setLeadText'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="setImageCaption">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'Address'"/>
-        <xsl:with-param name="setting" select="'setImageCaption'"/>
-        <xsl:with-param name="default" select="'true'"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="setImageMaxHeight">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'Address'"/>
-        <xsl:with-param name="setting" select="'setImageMaxHeight'"/>
-        <xsl:with-param name="default" select="''"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="setImageMaxWidth">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'Address'"/>
-        <xsl:with-param name="setting" select="'setImageMaxWidth'"/>
-        <xsl:with-param name="default" select="''"/>
-      </xsl:call-template>
-    </xsl:variable>
     <xsl:variable name="setAddress">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'Address'"/>
+        <xsl:with-param name="module"  select="'OldAddress'"/>
         <xsl:with-param name="setting" select="'setAddress'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setPostalCode">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'Address'"/>
+        <xsl:with-param name="module"  select="'OldAddress'"/>
         <xsl:with-param name="setting" select="'setPostalCode'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setCountryName">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'Address'"/>
+        <xsl:with-param name="module"  select="'OldAddress'"/>
         <xsl:with-param name="setting" select="'setCountryName'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setPhone">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'Address'"/>
+        <xsl:with-param name="module"  select="'OldAddress'"/>
         <xsl:with-param name="setting" select="'setPhone'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setMobile">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'Address'"/>
+        <xsl:with-param name="module"  select="'OldAddress'"/>
         <xsl:with-param name="setting" select="'setMobile'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setFax">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'Address'"/>
+        <xsl:with-param name="module"  select="'OldAddress'"/>
         <xsl:with-param name="setting" select="'setFax'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setEmail">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'Address'"/>
+        <xsl:with-param name="module"  select="'OldAddress'"/>
         <xsl:with-param name="setting" select="'setEmail'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setNotes">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'Address'"/>
+        <xsl:with-param name="module"  select="'OldAddress'"/>
         <xsl:with-param name="setting" select="'setNotes'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="setLeadText">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'Address'"/>
-        <xsl:with-param name="setting" select="'setLeadText'"/>
-        <xsl:with-param name="default" select="'true'"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <div id="details">
-      <xsl:if test="$setImage = 'true'">
-        <xsl:call-template name="mandalay:imageAttachment">
-          <xsl:with-param name="showCaption" select="$setImageCaption" />
-          <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
-          <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
-        </xsl:call-template>
-      </xsl:if>
 
     <xsl:if test="./address and $setAddress = 'true'">
       <p>
@@ -237,14 +196,67 @@
         <xsl:value-of disable-output-escaping="yes" select="./notes"/>
       </p>
     </xsl:if>
-    </div>
 
-    <div id="mainBody">
     <xsl:if test="./lead and $setLeadText = 'true'">
-        <div id="lead">
+      <div class="lead">
         <xsl:value-of disable-output-escaping="yes" select="./lead"/>
       </div>
     </xsl:if>
+
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.OldAddress']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'OldAddress'"/>
+        <xsl:with-param name="setting" select="'setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageMaxHeight">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'OldAddress'"/>
+        <xsl:with-param name="setting" select="'setImageMaxHeight'"/>
+        <xsl:with-param name="default" select="''"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageMaxWidth">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'OldAddress'"/>
+        <xsl:with-param name="setting" select="'setImageMaxWidth'"/>
+        <xsl:with-param name="default" select="''"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageCaption">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'OldAddress'"/>
+        <xsl:with-param name="setting" select="'setImageCaption'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="$setImage = 'true'">
+      <xsl:call-template name="mandalay:imageAttachment">
+        <xsl:with-param name="showCaption" select="$setImageCaption"/>
+        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Vollansicht -->
+  <!-- EN Detailed view -->
+  <xsl:template name="CT_Address_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.Address']" mode="detailed_view">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+
+    <div id="mainBody">
       <xsl:value-of disable-output-escaping="yes" select="./textAsset/content"/>
     </div>
     <div class="endFloat"/>
@@ -277,14 +289,45 @@
         <xsl:with-param name="default" select="'0'"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'Address'"/>
+        <xsl:with-param name="setting" select="'listView/setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:variable name="setMoreButton">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'Address'"/>
         <xsl:with-param name="setting" select="'listView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
+    <xsl:if test="$setImage = 'true' and nav:attribute[@name='imageAttachments.image.id']">
+      <a>
+        <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
+        <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>
+
     <xsl:choose>
       <xsl:when test="$setLinkToDetails = 'true' or (string-length(nav:attribute[@name='lead']) > $setLeadTextLength and $setLeadTextLength != '0')">
         <a class="CIname">
@@ -322,26 +365,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(nav:attribute[@name='lead'], 1, $setLeadTextLength)" />
             <xsl:if test="string-length(nav:attribute[@name='lead']) > $setLeadTextLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="nav:path"/>
                   <xsl:with-param name="module" select="'Address'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'Address'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="nav:path"/>
+            <xsl:with-param name="module" select="'Address'"/>
+          </xsl:call-template>
+        </xsl:if>
       </span>
     </xsl:if>
   </xsl:template>
@@ -410,7 +448,7 @@
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'Address'"/>
         <xsl:with-param name="setting" select="'linkView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
@@ -489,26 +527,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(./linkDescription, 1, $setDescriptionLength)" />
             <xsl:if test="string-length(./linkDescription) > $setDescriptionLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="./targetItem/@oid"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
-                        <xsl:with-param name="module" select="'Address'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="./targetItem/@oid"/>
+                  <xsl:with-param name="module" select="'Adress'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'Address'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="./targetItem/@oid"/>
+            <xsl:with-param name="module" select="'Address'"/>
+          </xsl:call-template>
+        </xsl:if>
       </xsl:if>
     </xsl:if>
   </xsl:template>

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

@@ -27,6 +27,19 @@
 		  xmlns:mandalay="http://mandalay.quasiweb.de"
 		  exclude-result-prefixes="xsl bebop cms nav"
 		  version="1.0">
+
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Organization']" mode="lead">
+    <xsl:call-template name="CT_OrganizationalUnit_lead"/>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Organization']" mode="image">
+    <xsl:call-template name="CT_OrganizationalUnit_image"/>
+  </xsl:template>
+
   <!-- DE Vollansicht -->
   <!-- EN Detailed view -->
   <xsl:template name="CT_Organization_graphics" 

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

@@ -29,7 +29,28 @@
   exclude-result-prefixes="xsl bebop cms nav"
   version="1.0">
 
-  <xsl:template name="CT_OrgnizationalUnit_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.OrganizationalUnit']" mode="detailed_view">
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.OrganizationalUnit']" mode="lead">
+    <xsl:variable name="setLeadText">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'OrganizationalUnit'"/>
+        <xsl:with-param name="setting" select="'setLeadText'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="./lead and $setLeadText = 'true'">
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./lead"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.OrganizationalUnit']" mode="image">
+
     <!-- DE Hole alle benötigten Einstellungen-->
     <!-- EN Getting all needed setting-->
     <xsl:variable name="setImage">
@@ -39,13 +60,6 @@
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="setImageCaption">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'OrganizationalUnit'"/>
-        <xsl:with-param name="setting" select="'setImageCaption'"/>
-        <xsl:with-param name="default" select="'true'"/>
-      </xsl:call-template>
-    </xsl:variable>
     <xsl:variable name="setImageMaxHeight">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'OrganizationalUnit'"/>
@@ -60,6 +74,26 @@
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImageCaption">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'OrganizationalUnit'"/>
+        <xsl:with-param name="setting" select="'setImageCaption'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="$setImage = 'true'">
+      <xsl:call-template name="mandalay:imageAttachment">
+        <xsl:with-param name="showCaption" select="$setImageCaption"/>
+        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template name="CT_OrgnizationalUnit_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.OrganizationalUnit']" mode="detailed_view">
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
     <xsl:variable name="setDirection">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module" select="'OrganizationalUnit'"/>
@@ -111,14 +145,6 @@
     </xsl:variable>
 
     <div id="details">
-      <xsl:if test="$setImage = 'true'">
-        <xsl:call-template name="mandalay:imageAttachment">
-          <xsl:with-param name="showCaption" select="$setImageCaption" />
-          <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
-          <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
-        </xsl:call-template>
-      </xsl:if>
-
       <p>
         <xsl:value-of select="./organizationalunitDescription"/>
       </p>
@@ -263,14 +289,45 @@
         <xsl:with-param name="default" select="'0'"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'OrganizationalUnit'"/>
+        <xsl:with-param name="setting" select="'listView/setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:variable name="setMoreButton">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'OrganizationalUnit'"/>
         <xsl:with-param name="setting" select="'listView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
+    <xsl:if test="$setImage = 'true' and nav:attribute[@name='imageAttachments.image.id']">
+      <a>
+        <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
+        <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>
+
     <xsl:choose>
       <xsl:when test="$setLinkToDetails = 'true' or (string-length(nav:attribute[@name='lead']) > $setLeadTextLength and $setLeadTextLength != '0')">
         <a class="CIname">
@@ -308,26 +365,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(nav:attribute[@name='lead'], 1, $setLeadTextLength)" />
             <xsl:if test="string-length(nav:attribute[@name='lead']) > $setLeadTextLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="nav:path"/>
                   <xsl:with-param name="module" select="'OrganizationalUnit'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'OrganizationalUnit'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="nav:path"/>
+            <xsl:with-param name="module" select="'OrganizationalUnit'"/>
+          </xsl:call-template>
+        </xsl:if>
       </span>
     </xsl:if>
   </xsl:template>
@@ -396,7 +448,7 @@
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'OrganizationalUnit'"/>
         <xsl:with-param name="setting" select="'linkView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
@@ -475,26 +527,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(./linkDescription, 1, $setDescriptionLength)" />
             <xsl:if test="string-length(./linkDescription) > $setDescriptionLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="./targetItem/@oid"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="./targetItem/@oid"/>
                   <xsl:with-param name="module" select="'OrganizationalUnit'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'OrganizationalUnit'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="./targetItem/@oid"/>
+            <xsl:with-param name="module" select="'OrganizationalUnit'"/>
+          </xsl:call-template>
+        </xsl:if>
       </xsl:if>
     </xsl:if>
   </xsl:template>

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

@@ -29,12 +29,16 @@
 	exclude-result-prefixes="xsl bebop cms"
 	version="1.0">
 
-  <!-- DE Vollansicht -->
-  <!-- EN Detailed view -->
-  <xsl:template name="CT_Person_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.Person']" mode="detailed_view">
-    
-    <!-- DE Hole alle benötigten Einstellungen-->
-    <!-- EN Getting all needed setting-->
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Person']" mode="lead">
+    <xsl:variable name="setLeadText">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'Person'"/>
+        <xsl:with-param name="setting" select="'setLeadText'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:variable name="setFullname">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'Person'"/>
@@ -70,6 +74,27 @@
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
+
+    <xsl:call-template name="CT_GenericPerson_details">
+      <xsl:with-param name="setFullname" select="$setFullname"/>
+      <xsl:with-param name="setNameDetails" select="$setNameDetails"/>
+      <xsl:with-param name="setGender" select="$setGender"/>
+      <xsl:with-param name="setBirthdate" select="$setBirthdate"/>
+    </xsl:call-template>
+
+    <xsl:if test="./pageDescription and $setLeadText = 'true'">
+      <div id="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./pageDescription"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Person']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
     <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'Person'"/>
@@ -99,21 +124,21 @@
       </xsl:call-template>
     </xsl:variable>
 
-    <div id="greeting">
-      <xsl:call-template name="CT_GenericPerson_details">
-        <xsl:with-param name="setFullname" select="$setFullname"/>
-        <xsl:with-param name="setNameDetails" select="$setNameDetails"/>
-        <xsl:with-param name="setGender" select="$setGender"/>
-        <xsl:with-param name="setBirthdate" select="$setBirthdate"/>
+    <xsl:if test="$setImage = 'true'">
+      <xsl:call-template name="mandalay:imageAttachment">
+        <xsl:with-param name="showCaption" select="$setImageCaption"/>
+        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
       </xsl:call-template>
-
-      <xsl:if test="./pageDescription and $setDescription = 'true'">
-        <div id="lead">
-          <xsl:value-of disable-output-escaping="yes" select="./pageDescription"/>
-        </div>
     </xsl:if>
-    </div>
+  </xsl:template>
 
+  <!-- DE Vollansicht -->
+  <!-- EN Detailed view -->
+  <xsl:template name="CT_Person_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.Person']" mode="detailed_view">
+    
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
     <xsl:for-each select="./contacts">
       <xsl:call-template name="CT_GenericContact_details">
       <xsl:with-param name="setFullname" select="'false'"/>
@@ -123,13 +148,6 @@
       </xsl:call-template>
     </xsl:for-each>
 
-    <xsl:if test="$setImage = 'true'">
-      <xsl:call-template name="mandalay:imageAttachment">
-        <xsl:with-param name="showCaption" select="$setImageCaption"/>
-        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
-        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
-      </xsl:call-template>
-    </xsl:if>
     <div class="endFloat"/>
   </xsl:template>
 
@@ -153,13 +171,6 @@
         <xsl:with-param name="default" select="'0'"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="setMoreButton">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'Person'"/>
-        <xsl:with-param name="setting" select="'listView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
-      </xsl:call-template>
-    </xsl:variable>
     <xsl:variable name="setAddress">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module" select="'Person'"/>
@@ -174,6 +185,44 @@
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'Person'"/>
+        <xsl:with-param name="setting" select="'listView/setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setMoreButton">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'Person'"/>
+        <xsl:with-param name="setting" select="'listView/setMoreButton'"/>
+        <xsl:with-param name="default" select="'auto'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="$setImage = 'true' and nav:attribute[@name='imageAttachments.image.id']">
+      <a>
+        <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
+        <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>
 
     <xsl:choose>
       <xsl:when test="($linkMembers = 'true') and (string-length(./contacts/contact[@contactType='commonContact']/contactentries[keyId='homepage']/value) &gt; 1)">
@@ -264,12 +313,10 @@
                     <xsl:with-param name="from" select="' '"/>
                     <xsl:with-param name="to" select="'&nbsp;'"/>
                   </xsl:call-template>
-		  <!--<xsl:value-of select="./value"/>-->
                 </xsl:otherwise>
               </xsl:choose>
             </span>
           </span>
-	  <!--<xsl:text> </xsl:text>-->
         </xsl:if>
       </xsl:for-each>
 
@@ -296,57 +343,13 @@
         </span>
       </xsl:if>
     </span>
-
-<!--    <a class="CIname">
-      <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>
-      <xsl:call-template name="mandalay:shying">
-        <xsl:with-param name="title">
-          <xsl:value-of disable-output-escaping="yes" select="nav:attribute[@name='title']"/>
-        </xsl:with-param>
-        <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">
-        <xsl:choose>
-          <xsl:when test="$setLeadTextLength = '0'">
-            <xsl:value-of disable-output-escaping="yes" select="nav:attribute[@name='lead']" />
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of disable-output-escaping="yes" select="substring(nav:attribute[@name='lead'], 1, $setLeadTextLength)" />
-            <xsl:if test="string-length(nav:attribute[@name='lead']) > $setLeadTextLength">
-              <xsl:text>...</xsl:text>
     <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+      <xsl:call-template name="mandalay:moreButton">
+        <xsl:with-param name="href" select="nav:path"/>
         <xsl:with-param name="module" select="'Person'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
       </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'Person'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
     </xsl:if>
-            </xsl:if>
-          </xsl:otherwise>
-        </xsl:choose>
-      </span>
-    </xsl:if>-->
+
   </xsl:template>
 
   <xsl:template name="CT_Person_Link" match="*/cms:item/links[targetItem/objectType = 'com.arsdigita.cms.contenttypes.Person']" mode="link_view">
@@ -406,7 +409,7 @@
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'Person'"/>
         <xsl:with-param name="setting" select="'linkView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
@@ -460,26 +463,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(./linkDescription, 1, $setDescriptionLength)" />
             <xsl:if test="string-length(./linkDescription) > $setDescriptionLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="./targetItem/@oid"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="./targetItem/@oid"/>
                   <xsl:with-param name="module" select="'Person'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'Person'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="./targetItem/@oid"/>
+            <xsl:with-param name="module" select="'Person'"/>
+          </xsl:call-template>
+        </xsl:if>
       </xsl:if>
     </xsl:if>
   </xsl:template>

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

@@ -27,11 +27,22 @@
 		  xmlns:mandalay="http://mandalay.quasiweb.de"
 		  exclude-result-prefixes="xsl bebop cms nav"
 		  version="1.0">
+
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Project']" mode="lead">
+    <xsl:call-template name="CT_OrganizationalUnit_lead"/>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Project']" mode="image">
+    <xsl:call-template name="CT_OrganizationalUnit_image"/>
+  </xsl:template>
+
   <!-- DE Vollansicht -->
   <!-- EN Detailed view -->
-  <xsl:template name="CT_Project_graphics" 
-		match="cms:item[objectType='com.arsdigita.cms.contenttypes.Project']"		
-		mode="detailed_view">
+  <xsl:template name="CT_Project_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.Project']" mode="detailed_view">
     <!-- Simply call the template for the GenericOrganization -->
     <xsl:call-template name="CT_GenericOrganizationalUnit_graphics"/>
   </xsl:template>
@@ -46,7 +57,4 @@
     <xsl:call-template name="CT_GenericOrganizationalUnit_Link"/>
   </xsl:template>
 
-
-
-
 </xsl:stylesheet>

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

@@ -29,12 +29,28 @@
   exclude-result-prefixes="xsl bebop cms nav"
   version="1.0">
 
-    <!-- DE Importiere wichtige Funktionen -->
-  <!-- EN Using some includes -->
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.ResearchNetwork']" mode="lead">
+    <xsl:variable name="setLeadText">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'ResearchNetwork'"/>
+        <xsl:with-param name="setting" select="'setLeadText'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="./lead and $setLeadText = 'true'">
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./lead"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.ResearchNetwork']" mode="image">
 
-  <!-- DE Vollansicht -->
-  <!-- EN Detailed view -->
-  <xsl:template name="CT_ResearchNetwork_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.ResearchNetwork']" mode="detailed_view">
     <!-- DE Hole alle benötigten Einstellungen-->
     <!-- EN Getting all needed setting-->
     <xsl:variable name="setImage">
@@ -44,13 +60,6 @@
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="setImageCaption">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'ResearchNetwork'"/>
-        <xsl:with-param name="setting" select="'setImageCaption'"/>
-        <xsl:with-param name="default" select="'true'"/>
-      </xsl:call-template>
-    </xsl:variable>
     <xsl:variable name="setImageMaxHeight">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'ResearchNetwork'"/>
@@ -65,6 +74,28 @@
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImageCaption">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'ResearchNetwork'"/>
+        <xsl:with-param name="setting" select="'setImageCaption'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="$setImage = 'true'">
+      <xsl:call-template name="mandalay:imageAttachment">
+        <xsl:with-param name="showCaption" select="$setImageCaption"/>
+        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Vollansicht -->
+  <!-- EN Detailed view -->
+  <xsl:template name="CT_ResearchNetwork_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.ResearchNetwork']" mode="detailed_view">
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
     <xsl:variable name="setDirection">      
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module" select="'ResearchNetwork'"/>
@@ -109,14 +140,6 @@
     </xsl:variable>
     
     <div id="details">
-      <xsl:if test="$setImage = 'true'">
-        <xsl:call-template name="mandalay:imageAttachment">
-          <xsl:with-param name="showCaption" select="$setImageCaption" />
-          <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
-          <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
-        </xsl:call-template>
-      </xsl:if>
-
       <xsl:if test="$setDescription = 'true'">
         <p id="researchNetworkDescription">
           <xsl:value-of select="./researchNetworkDescription"/>
@@ -229,14 +252,45 @@
         <xsl:with-param name="default" select="'0'"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'ResearchNetwork'"/>
+        <xsl:with-param name="setting" select="'listView/setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:variable name="setMoreButton">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'ResearchNetwork'"/>
         <xsl:with-param name="setting" select="'listView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
+    <xsl:if test="$setImage = 'true' and nav:attribute[@name='imageAttachments.image.id']">
+      <a>
+        <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
+        <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>
+
     <xsl:choose>
       <xsl:when test="$setLinkToDetails = 'true' or (string-length(nav:attribute[@name='lead']) > $setLeadTextLength and $setLeadTextLength != '0')">
         <a class="CIname">
@@ -274,26 +328,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(nav:attribute[@name='lead'], 1, $setLeadTextLength)" />
             <xsl:if test="string-length(nav:attribute[@name='lead']) > $setLeadTextLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="nav:path"/>
                   <xsl:with-param name="module" select="'ResearchNetwork'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'ResearchNetwork'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="nav:path"/>
+            <xsl:with-param name="module" select="'ResearchNetwork'"/>
+          </xsl:call-template>
+        </xsl:if>
       </span>
     </xsl:if>
   </xsl:template>
@@ -362,7 +411,7 @@
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'ResearchNetwork'"/>
         <xsl:with-param name="setting" select="'linkView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
@@ -441,26 +490,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(./linkDescription, 1, $setDescriptionLength)" />
             <xsl:if test="string-length(./linkDescription) > $setDescriptionLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="./targetItem/@oid"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="./targetItem/@oid"/>
                   <xsl:with-param name="module" select="'ResearchNetwork'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'ResearchNetwork'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="./targetItem/@oid"/>
+            <xsl:with-param name="module" select="'ResearchNetwork'"/>
+          </xsl:call-template>
+        </xsl:if>
       </xsl:if>
     </xsl:if>
   </xsl:template>

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

@@ -33,12 +33,9 @@
 
   <xsl:import href="../../user/includes/types/SiteProxy.xsl"/>
 
-  <!-- DE Vollansicht -->
-  <!-- EN Detailed view -->
-  <xsl:template name="CT_SiteProxy_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.SiteProxy']" mode="detailed_view">
-
-    <!-- DE Hole alle benötigten Einstellungen-->
-    <!-- EN Getting all needed setting-->
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.SiteProxy']" mode="lead">
     <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'SiteProxy'"/>
@@ -46,6 +43,20 @@
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
+
+    <xsl:if test="./lead and $setLeadText = 'true'">
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./lead"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.SiteProxy']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
     <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'SiteProxy'"/>
@@ -75,13 +86,6 @@
       </xsl:call-template>
     </xsl:variable>
 
-    <div id="greeting">
-      <xsl:if test="./lead and $setLeadText = 'true'">
-        <div id="lead">
-          <xsl:value-of disable-output-escaping="yes" select="./lead"/>
-        </div>
-      </xsl:if>
-    </div>
     <xsl:if test="$setImage = 'true'">
       <xsl:call-template name="mandalay:imageAttachment">
         <xsl:with-param name="showCaption" select="$setImageCaption"/>
@@ -89,6 +93,14 @@
         <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
       </xsl:call-template>
     </xsl:if>
+  </xsl:template>
+
+  <!-- DE Vollansicht -->
+  <!-- EN Detailed view -->
+  <xsl:template name="CT_SiteProxy_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.SiteProxy']" mode="detailed_view">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
 
     <div id="mainBody">
       <xsl:apply-templates select="/bebop:page/cms:contentPanel[@id = 'siteProxyItemXML']"/>
@@ -118,14 +130,45 @@
         <xsl:with-param name="default" select="'0'"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SiteProxy'"/>
+        <xsl:with-param name="setting" select="'listView/setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:variable name="setMoreButton">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'SiteProxy'"/>
         <xsl:with-param name="setting" select="'listView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
+    <xsl:if test="$setImage = 'true' and nav:attribute[@name='imageAttachments.image.id']">
+      <a>
+        <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
+        <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">
@@ -154,26 +197,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(nav:attribute[@name='lead'], 1, $setLeadTextLength)" />
             <xsl:if test="string-length(nav:attribute[@name='lead']) > $setLeadTextLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="nav:path"/>
                   <xsl:with-param name="module" select="'SiteProxy'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'SiteProxy'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="nav:path"/>
+            <xsl:with-param name="module" select="'SiteProxy'"/>
+          </xsl:call-template>
+        </xsl:if>
       </span>
     </xsl:if>
   </xsl:template>
@@ -235,7 +273,7 @@
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'SiteProxy'"/>
         <xsl:with-param name="setting" select="'linkView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
@@ -289,26 +327,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(./linkDescription, 1, $setDescriptionLength)" />
             <xsl:if test="string-length(./linkDescription) > $setDescriptionLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="./targetItem/@oid"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="./targetItem/@oid"/>
                   <xsl:with-param name="module" select="'SiteProxy'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'SiteProxy'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="./targetItem/@oid"/>
+            <xsl:with-param name="module" select="'SiteProxy'"/>
+          </xsl:call-template>
+        </xsl:if>
       </xsl:if>
     </xsl:if>
   </xsl:template>

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

@@ -42,9 +42,27 @@
   exclude-result-prefixes="xsl bebop cms"
   version="1.0">
 
-  <!-- DE Vollansicht -->
-  <!-- EN Detailed view -->
-  <xsl:template name="CT_Survey_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.Survey']" mode="detailed_view">
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Survey']" mode="lead">
+    <xsl:variable name="setLeadText">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'Survey'"/>
+        <xsl:with-param name="setting" select="'setLeadText'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="./form/description and $setLeadText = 'true'">
+      <div id="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./form/description"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Survey']" mode="image">
 
     <!-- DE Hole alle benötigten Einstellungen-->
     <!-- EN Getting all needed setting-->
@@ -76,21 +94,7 @@
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="setLeadText">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'Survey'"/>
-        <xsl:with-param name="setting" select="'setLeadText'"/>
-        <xsl:with-param name="default" select="'true'"/>
-      </xsl:call-template>
-    </xsl:variable>
 
-    <div id="greeting">
-      <xsl:if test="./form/description">
-        <div id="lead">
-          <xsl:value-of disable-output-escaping="yes" select="./form/description"/>
-        </div>
-      </xsl:if>
-    </div>
     <xsl:if test="$setImage = 'true'">
       <xsl:call-template name="mandalay:imageAttachment">
         <xsl:with-param name="showCaption" select="$setImageCaption"/>
@@ -98,7 +102,14 @@
         <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
       </xsl:call-template>
     </xsl:if>
+  </xsl:template>
 
+  <!-- DE Vollansicht -->
+  <!-- EN Detailed view -->
+  <xsl:template name="CT_Survey_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.Survey']" mode="detailed_view">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
     <div id="mainBody">
       <xsl:value-of disable-output-escaping="yes" select="./definition"/>
 
@@ -176,14 +187,45 @@
         <xsl:with-param name="default" select="'0'"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'Survey'"/>
+        <xsl:with-param name="setting" select="'listView/setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:variable name="setMoreButton">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'Survey'"/>
         <xsl:with-param name="setting" select="'listView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
+    <xsl:if test="$setImage = 'true' and nav:attribute[@name='imageAttachments.image.id']">
+      <a>
+        <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
+        <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">
@@ -212,26 +254,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(nav:attribute[@name='lead'], 1, $setLeadTextLength)" />
             <xsl:if test="string-length(nav:attribute[@name='lead']) > $setLeadTextLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="nav:path"/>
                   <xsl:with-param name="module" select="'Survey'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'Survey'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="nav:path"/>
+            <xsl:with-param name="module" select="'Survey'"/>
+          </xsl:call-template>
+        </xsl:if>
       </span>
     </xsl:if>
   </xsl:template>
@@ -293,7 +330,7 @@
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'Survey'"/>
         <xsl:with-param name="setting" select="'linkView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'auto'"/>
       </xsl:call-template>
     </xsl:variable>
 
@@ -347,26 +384,21 @@
             <xsl:value-of disable-output-escaping="yes" select="substring(./linkDescription, 1, $setDescriptionLength)" />
             <xsl:if test="string-length(./linkDescription) > $setDescriptionLength">
               <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="./targetItem/@oid"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
+              <xsl:if test="$setMoreButton = 'auto'">
+                <xsl:call-template name="mandalay:moreButton">
+                  <xsl:with-param name="href" select="./targetItem/@oid"/>
                   <xsl:with-param name="module" select="'Survey'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
                 </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'Survey'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
               </xsl:if>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="$setMoreButton = 'true'">
+          <xsl:call-template name="mandalay:moreButton">
+            <xsl:with-param name="href" select="./targetItem/@oid"/>
+            <xsl:with-param name="module" select="'Survey'"/>
+          </xsl:call-template>
+        </xsl:if>
       </xsl:if>
     </xsl:if>
   </xsl:template>

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

@@ -29,12 +29,75 @@
 	exclude-result-prefixes="xsl bebop cms"
 	version="1.0">
 
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.{Name}']" mode="lead">
+    <xsl:variable name="setLeadText">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'{Name}'"/>
+        <xsl:with-param name="setting" select="'setLeadText'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="./lead and $setLeadText = 'true'">
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./lead"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.{Name}']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'{Name}'"/>
+        <xsl:with-param name="setting" select="'setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageMaxHeight">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'{Name}'"/>
+        <xsl:with-param name="setting" select="'setImageMaxHeight'"/>
+        <xsl:with-param name="default" select="''"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageMaxWidth">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'{Name}'"/>
+        <xsl:with-param name="setting" select="'setImageMaxWidth'"/>
+        <xsl:with-param name="default" select="''"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageCaption">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'{Name}'"/>
+        <xsl:with-param name="setting" select="'setImageCaption'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="$setImage = 'true'">
+      <xsl:call-template name="mandalay:imageAttachment">
+        <xsl:with-param name="showCaption" select="$setImageCaption"/>
+        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
   <!-- DE Vollansicht -->
   <!-- EN Detailed view -->
   <xsl:template name="CT_{Name}_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.{Name}']" mode="detailed_view">
 
     <!-- DE Hole alle benötigten Einstellungen-->
     <!-- EN Getting all needed setting-->
+<!--
     <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'{Name}'"/>
@@ -85,6 +148,7 @@
         <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
       </xsl:call-template>
     </xsl:if>
+-->
 
     <xsl:if test="./textAsset/content">
       <div id="mainBody">

ccm-sci-bundle/web/themes/mandalay/lang/de/SciProject.xml

@@ -47,6 +47,7 @@
     <line id="summaryTab/headPreText"> </line>
     <line id="summaryTab/headPostText">(Projektleitung)</line>
 
+    <line id="summaryTab/sponsor">Drittmittelgeber</line>
     <line id="summaryTab/fundingHeading">Finanzierung</line>    
     <line id="summaryTab/fundingVolumeHeading">Volumen der Finanzierung</line>  
 

ccm-sci-bundle/web/themes/mandalay/lang/de/global.xml

@@ -29,6 +29,7 @@
   <line id="filesize/gibibyte"> GiB</line>
 
   <line id="layout/page/head/title">Mandalay-Theme für ScientificCMS</line>
+  <line id="layout/page/header/title">Universität von Mandalay</line>
 
   <line id="layout/page/footer/scientificcms/alt">Powered by: ScientificCMS</line>
   <line id="layout/page/footer/scientificcms/title">Powered by: ScientificCMS</line>

ccm-sci-bundle/web/themes/mandalay/lang/de/objectList.xml

@@ -23,7 +23,7 @@
   <line id="lang">Deutsch</line>
   <line id="version">0.7</line>
 
-  <line id="eventList/heading">Aktuelle Veranstaltungen</line>
+  <line id="eventList/heading">Veranstaltungen</line>
   <line id="eventList/atoz/any">A-Z</line>
   <line id="eventList/atoz/heading">Aktuelle Veranstaltungen</line>
   <line id="eventList/atoz/infoLine">Inhalt beginnend mit dem Buchstaben: </line>

ccm-sci-bundle/web/themes/mandalay/lang/de/relatedLinks.xml

@@ -23,5 +23,5 @@
   <line id="lang">Deutsch</line>
   <line id="version">0.7</line>
 
-  <line id="heading">Siehe auch</line>
+  <line id="heading">Weiterführende Informationen</line>
 </translations>

ccm-sci-bundle/web/themes/mandalay/lang/en/FileStorageItem.xml

@@ -3,10 +3,10 @@
   <line id="lang">English</line>
   <line id="version">0.7</line>
 
-  <line id="download/link">Saving</line>
-  <line id="download/title">Save file to local drive</line>
-  <line id="view/link">See</line>
-  <line id="view/title">See this file online</line>
+  <line id="download/link">Download</line>
+  <line id="download/title">Save file to your drive</line>
+  <line id="view/link">View</line>
+  <line id="view/title">View this file online</line>
 
   <line id="moreButton">more »</line>
   <line id="moreButtonTitle">read more</line>

ccm-sci-bundle/web/themes/mandalay/lang/en/SciProject.xml

@@ -45,6 +45,7 @@
     <line id="summaryTab/headPreText"> </line>
     <line id="summaryTab/headPostText">(project coordinator)</line>
 
+    <line id="summaryTab/sponsor">Sponsor</line>
     <line id="summaryTab/fundingHeading">Funding</line>  
     <line id="summaryTab/fundingVolumeHeading">Volume of funding</line>