From 711beb8e956b41b26d4d85ac12daa6afae628904 Mon Sep 17 00:00:00 2001
From: vv01f <vv01f@localhost>
Date: Fri, 28 Feb 2014 02:56:00 +0100
Subject: [PATCH] start/end time and link tocalendar added in common.xsl for
 portal.html

---
 xsl/calendar.xsl |  2 +-
 xsl/common.xsl   | 51 ++++++++++++++++++++++++++++++++----------------
 2 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/xsl/calendar.xsl b/xsl/calendar.xsl
index 2dc79b490..15258ea3f 100644
--- a/xsl/calendar.xsl
+++ b/xsl/calendar.xsl
@@ -77,7 +77,7 @@
         <xsl:otherwise>3</xsl:otherwise>
       </xsl:choose>
     </xsl:attribute>
-    <!-- vv01f: adding id to jump to a specific date with links and hashtag liek {$month}-{$day} //-->
+    <!-- vv01f: added id to jump to a specific date with links and hashtag liek {$month}-{$day} //-->
     <xsl:attribute name="id">
 		<xsl:value-of select="concat(date:month-in-year($date), '-', date:day-in-month($date))"/>
     </xsl:attribute>
diff --git a/xsl/common.xsl b/xsl/common.xsl
index d43503435..1ce247d40 100644
--- a/xsl/common.xsl
+++ b/xsl/common.xsl
@@ -235,24 +235,41 @@
           </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>
-		<xsl:if test="string-length($href) &gt; 0">
-		  <xsl:attribute name="href">
-		    <xsl:value-of select="$href"/>
-		  </xsl:attribute>
-		</xsl:if>
-		<xsl:if test="string-length(location) &gt; 0">
-		  <xsl:attribute name="title">
-		    <xsl:value-of select="concat('Ort: ', location)"/>
-		  </xsl:attribute>
-		</xsl:if>
-                <xsl:value-of select="title"/>
-              </a>
+			<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>
+				<xsl:if test="string-length($href) &gt; 0">
+					<xsl:attribute name="href">
+						<xsl:value-of select="$href"/>
+					</xsl:attribute>
+				</xsl:if>
+				<!-- vv01f: added link to a specific date in calndar //-->
+				<xsl:if test="string-length($href) = 0">
+					<xsl:attribute name="href">
+						<xsl:value-of select="concat('calendar.html#',concat(date:month-in-year(start), '-'), date:day-in-month(start))"/>
+					</xsl:attribute>
+				</xsl:if>
+
+				<xsl:if test="string-length(location) &gt; 0">
+					<xsl:attribute name="title">
+						<xsl:value-of select="concat('Ort: ', location)"/>
+						<xsl:if test="string-length(date:time(start)) &gt; 0 or string-length(date:time(end)) &gt; 0">
+							<xsl:value-of select="concat('&#xA;', 'Zeit:')" disable-output-escaping="yes"/>
+							<xsl:if test="string-length(date:time(start)) &gt; 0 and substring(date:time(start),1,5) != ''">
+								<xsl:value-of select="concat(' ab ', substring(date:time(start),1,5))"/>
+							</xsl:if>
+							<xsl:if test="string-length(date:time(end)) &gt; 0 and substring(date:time(end),1,5) != '' and substring(date:time(end),1,5) !=  substring(date:time(start),1,5)">
+								<xsl:value-of select="concat('&#160;bis&#160;', substring(date:time(end),1,5))"/>
+							</xsl:if>
+						</xsl:if>
+					</xsl:attribute>
+				</xsl:if>
+				<xsl:value-of select="title"/>
+			</a>
           </li>
+
         </xsl:if>
       </xsl:for-each>
     </ul>