Many improvements:

[helm.git] / helm / mowgli / home / xsl / events.xsl

diff --git a/helm/mowgli/home/xsl/events.xsl b/helm/mowgli/home/xsl/events.xsl
index 1278fb87c07ee3b4d81861e6e1bec4b3076c9c90..66f1b7fa224bb99555221234656d22bec1c98832 100644 (file)
--- a/helm/mowgli/home/xsl/events.xsl
+++ b/helm/mowgli/home/xsl/events.xsl
@@ -21,9 +21,11 @@
     <h1>Mowgli Events</h1>
     <hr />
     <h1>Events Of Interest to MOWGLI ---
-        <a href="deadlines.html">Sort by deadlines!</a></h1>
+        <a href="deadlines.html" target="_top">Sort by deadlines!</a></h1>
     <dl>
-     <xsl:apply-templates/>
+     <xsl:apply-templates select="events/event">
+      <xsl:sort select="when/begin" data-type="number"/>
+     </xsl:apply-templates>
     </dl>
     <xsl:call-template name="foot">
      <xsl:with-param name="path_to_top" select="'.'"/>
@@ -42,7 +44,12 @@
    <xsl:text> </xsl:text>
   </xsl:if>
   <xsl:if test="when">
-   <b><xsl:value-of select="when"/></b>
+   <b>
+    <xsl:call-template name="print_interval">
+     <xsl:with-param name="begin" select="when/begin/text()"/>
+     <xsl:with-param name="end" select="when/end/text()"/>
+    </xsl:call-template>
+   </b>
    <br />
   </xsl:if>
   <xsl:if test="description">
@@ -60,10 +67,17 @@
 
 <xsl:template match="deadline">
  <li>
-  <b>
-   <xsl:call-template name="print_date">
-    <xsl:with-param name="date" select="date/text()"/>
+  <xsl:variable name="kind">
+   <xsl:call-template name="color_of_deadline_kind">
+    <xsl:with-param name="kind" select="@kind"/>
    </xsl:call-template>
+  </xsl:variable>
+  <b>
+   <span style="color: {$kind}">
+    <xsl:call-template name="print_date">
+     <xsl:with-param name="date" select="date/text()"/>
+    </xsl:call-template>
+   </span>
   </b>
   <xsl:text> </xsl:text>
   <xsl:value-of select="description"/>