From 1858a37bae0982dba13221790f13d6d188b8a923 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Wed, 26 Aug 2015 14:08:37 +0000
Subject: [PATCH] Small fix for Foundry

git-svn-id: https://svn.libreccm.org/ccm/trunk@3581 8810af33-2d31-482b-a856-94f89814c4df
---
 .../content-items/scipublications.xsl         | 54 +++++++++++++++++--
 .../foundry/lib/template-tags/html-tags.xsl   |  4 +-
 2 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/scipublications.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/scipublications.xsl
index 7134bbf56..a665fa283 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/scipublications.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/scipublications.xsl
@@ -40,9 +40,11 @@
             </xsl:variable>
             
             <xsl:if test="$data-tree/terms:assignedTerms">
-                <xsl:value-of select="if(position() &lt; count($data-tree//terms:assignedTerms/terms:term[@domain=$domain]))
-                                      then concat(./@name, $separator)
-                                      else ./@name"/>
+                <xsl:for-each select="$data-tree/terms:assignedTerms/terms:term[@domain=$domain]">
+                    <xsl:value-of select="if(position() &lt; count($data-tree//terms:assignedTerms/terms:term[@domain=$domain]))
+                                          then concat(./@name, $separator)
+                                          else ./@name"/>
+                </xsl:for-each>
             </xsl:if>
         </xsl:for-each>
     </xsl:template>
@@ -217,6 +219,21 @@
         </xsl:if>
     </xsl:template>
 
+    <xsl:template match="content-item-layout//language-of-publication">
+        <xsl:param name="contentitem-tree" tunnel="yes"/>
+        
+        <xsl:value-of select="foundry:get-static-text('language-codes', 
+                                                      $contentitem-tree/languageOfPublication)"/>
+    </xsl:template>
+    
+    <xsl:template match="content-item-layout//if-language-of-publication">
+        <xsl:param name="contentitem-tree" tunnel="yes"/>
+        
+        <xsl:if test="$contentitem-tree/languageOfPublication">
+            <xsl:apply-templates/>
+        </xsl:if>
+    </xsl:template>
+
     <xsl:template match="content-item-layout//scipublications//publication-series">
         <xsl:param name="contentitem-tree" tunnel="yes"/>
         
@@ -280,6 +297,15 @@
         </xsl:choose>
     </xsl:template>
     
+    <xsl:template match="content-item-layout//scipublications//if-abstract">
+        <xsl:param name="contentitem-tree" tunnel="yes"/>
+        
+        <xsl:if test="$contentitem-tree/abstract 
+                      and string-length($contentitem-tree/abstract) &gt; 0">
+            <xsl:apply-templates/>
+        </xsl:if>
+    </xsl:template>
+    
     <xsl:template match="content-item-layout//scipublications//if-misc">
         <xsl:param name="contentitem-tree" tunnel="yes"/>
         
@@ -696,12 +722,28 @@
         <xsl:value-of select="$contentitem-tree/dateFromOfConference"/>
     </xsl:template>
     
+    <xsl:template match="content-item-layout//scipublications//if-date-from-of-conference">
+        <xsl:param name="contentitem-tree" tunnel="yes"/>
+        
+        <xsl:if test="$contentitem-tree/dateFromOfConference">
+            <xsl:apply-templates/>
+        </xsl:if>
+    </xsl:template>
+    
     <xsl:template match="content-item-layout//scipublications//date-to-conference">
         <xsl:param name="contentitem-tree" tunnel="yes"/>
         
         <xsl:value-of select="$contentitem-tree/dateToOfConference"/>
     </xsl:template>
     
+    <xsl:template match="content-item-layout//scipublications//if-date-to-of-conference">
+        <xsl:param name="contentitem-tree" tunnel="yes"/>
+        
+        <xsl:if test="$contentitem-tree/dateToOfConference">
+            <xsl:apply-templates/>
+        </xsl:if>
+    </xsl:template>
+    
     <xsl:template match="content-item-layout//scipublications//if-proceedings">
         <xsl:param name="contentitem-tree" tunnel="yes"/>
         
@@ -736,6 +778,9 @@
                 <xsl:with-param name="contentitem-tree"
                                 tunnel="yes"
                                 select="."/>
+                <xsl:with-param name="href"
+                                tunnel="yes"
+                                select="concat($context-prefix, '/redirect?oid=', ./@oid)"/>
             </xsl:apply-templates>
         </xsl:for-each>
     </xsl:template>
@@ -788,6 +833,9 @@
                 <xsl:with-param name="contentitem-tree"
                                 tunnel="yes"
                                 select="."/>
+                <xsl:with-param name="href"
+                                tunnel="yes"
+                                select="concat($context-prefix, '/redirect/?oid=', ./@oid)"/>
             </xsl:apply-templates>
         </xsl:for-each>
     </xsl:template>
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
index 314fe84ab..07e97d1cf 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
@@ -1182,8 +1182,8 @@
                 Set favicon if exists. This three different variants for including the favicon
                 are necessary to satisfy all browsers.
             -->
-            <link href="{$theme-prefix}/images/favicon.png" 
-                  type="image/png" 
+            <link href="{$theme-prefix}/images/favicon.ico" 
+                  type="image/x-icon" 
                   rel="shortcut icon"/>
             
             <xsl:apply-templates select="$data-tree//script"/>