From 0845964088b2b6a4c9c766b23313047dac79185e Mon Sep 17 00:00:00 2001
From: astro <astro@31f61c52-7bfb-0310-b897-fc00f8a278f0>
Date: Fri, 18 May 2007 13:25:53 +0000
Subject: [PATCH] =?UTF-8?q?Kalender:=20Pentaradio-Termine=20(bitte=20anpas?=
 =?UTF-8?q?sen=20bei=20Announcement)=20Kalenderlinks=20d=C3=BCrfen=20jetzt?=
 =?UTF-8?q?=20relativ=20sein?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://svn.c3d2.de/c3d2-web/trunk@965 31f61c52-7bfb-0310-b897-fc00f8a278f0
---
 content/events.xml |  8 ++++++++
 xsl/calendar.xsl   | 11 +++++++++--
 xsl/common.xsl     | 38 ++++++++++++++++++++++++++------------
 3 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/content/events.xml b/content/events.xml
index 9da8b973e..a4353919f 100644
--- a/content/events.xml
+++ b/content/events.xml
@@ -140,4 +140,12 @@
     <start>2007-05-19</start>
     <link>http://odd.fritalk.com/de/OpenDiscussionDay</link>
   </event>
+  <event title="Pentaradio">
+    <start>2007-05-22</start>
+    <link>radio.html</link>
+  </event>
+  <event title="Pentaradio">
+    <start>2007-06-26</start>
+    <link>radio.html</link>
+  </event>
 </calendar>
diff --git a/xsl/calendar.xsl b/xsl/calendar.xsl
index 889fafa03..7a582c537 100644
--- a/xsl/calendar.xsl
+++ b/xsl/calendar.xsl
@@ -101,9 +101,16 @@
           </xsl:call-template>
         </xsl:variable>
 
-        <xsl:if test="(date:seconds($start) &lt;= date:seconds($date)) and (date:seconds($date) &lt;= date:seconds($end))">
+        <xsl:if test="(date:seconds($start) &lt;= date:seconds($date))
+                      and (date:seconds($date) &lt;= date:seconds($end))">
+          <xsl:variable name="href">
+            <xsl:call-template name="make-href">
+              <xsl:with-param name="href" select="link"/>
+            </xsl:call-template>
+          </xsl:variable>
+
           <li>
-            <a href="{link}">
+            <a href="{$href}">
               <xsl:value-of select="title"/>
             </a>
           </li>
diff --git a/xsl/common.xsl b/xsl/common.xsl
index 0ac61dc6b..4da4038d0 100644
--- a/xsl/common.xsl
+++ b/xsl/common.xsl
@@ -60,17 +60,9 @@
 
   <xsl:template match="link">
     <xsl:variable name="href">
-      <xsl:choose>
-        <xsl:when test="@href and not(contains(@href, ':'))">
-          <xsl:value-of select="concat($baseurl,@href)"/>
-        </xsl:when>
-        <xsl:when test="@href">
-          <xsl:value-of select="@href"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="."/>
-        </xsl:otherwise>
-      </xsl:choose>
+      <xsl:call-template name="make-href">
+        <xsl:with-param name="href" select="@href"/>
+      </xsl:call-template>
     </xsl:variable>
 
     <a href="{$href}">
@@ -78,6 +70,22 @@
     </a>
   </xsl:template>
 
+  <xsl:template name="make-href">
+    <xsl:param name="href"/>
+
+    <xsl:choose>
+      <xsl:when test="$href and not(contains($href, ':'))">
+        <xsl:value-of select="concat($baseurl,$href)"/>
+      </xsl:when>
+      <xsl:when test="$href">
+        <xsl:value-of select="$href"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="."/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
   <xsl:template match="em">
     <em>
       <xsl:value-of select="."/>
@@ -171,12 +179,18 @@
             <xsl:sort select="date:seconds(start)" data-type="number" order="ascending" />
 
             <xsl:if test="position() &lt;= $limit">
+              <xsl:variable name="href">
+                <xsl:call-template name="make-href">
+                  <xsl:with-param name="href" select="link"/>
+                </xsl:call-template>
+              </xsl:variable>
+
               <li>
                 <xsl:call-template name="datespan-to-human">
                   <xsl:with-param name="start" select="start"/>
                   <xsl:with-param name="end" select="end"/>
                 </xsl:call-template>:
-                <a href="{link}">
+                <a href="{$href}">
                   <xsl:value-of select="title"/>
                 </a>
               </li>