X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fmowgli%2Fhome%2Fxsl%2Fdeadlines.xsl;h=030c64480c026512d2adec9b9b64e7005613f49b;hb=9b149437fe0a9ed59e66cd87590ce6f1aed1ac64;hp=3c38cda7cc74b6602b531374554104d3b58297a6;hpb=44fc0fe4dba9031746aba9b756fec28123f6779a;p=helm.git

diff --git a/helm/mowgli/home/xsl/deadlines.xsl b/helm/mowgli/home/xsl/deadlines.xsl
index 3c38cda7c..030c64480 100644
--- a/helm/mowgli/home/xsl/deadlines.xsl
+++ b/helm/mowgli/home/xsl/deadlines.xsl
@@ -7,10 +7,16 @@
 
 <xsl:output method="html"/>
 
+<xsl:param name="events-class" select="''"/>
+<xsl:param name="today" select="''"/>
+
 <xsl:template match="/">
  <html>
   <head>
-   <title>Events Ordered by Deadlines</title>
+   <title>
+    <xsl:value-of select="$events-class"/>
+    <xsl:text> Events Sorted by Deadlines</xsl:text>
+   </title>
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
    <link rel="stylesheet" href="../style/mowgli.css" type="text/css"/>
   </head>
@@ -18,15 +24,31 @@
     <xsl:call-template name="head">
      <xsl:with-param name="path_to_top" select="'.'"/>
     </xsl:call-template>
-    <h1>Mowgli Events Ordered by Deadlines</h1>
+    <h1>
+     <xsl:value-of select="$events-class"/>
+     <xsl:text> Events</xsl:text>
+    </h1>
+    <xsl:variable name="url">
+     <xsl:choose>
+      <xsl:when test="$events-class='Other'">other-events.html</xsl:when>
+      <xsl:otherwise>mowgli-events.html</xsl:otherwise>
+     </xsl:choose>
+    </xsl:variable>
+    [<a href="{$url}">Sorted by event date</a>] [Sorted by deadline]
+    <br /><br />
     <hr />
-    <h1>Events Of Interest to MOWGLI Ordered by Deadlines ---
-        <a href="events.html">Order by events!</a></h1>
     <ul>
-     <xsl:apply-templates select="events/event/deadline">
+     <xsl:apply-templates select="events/event/deadline[date &gt;= $today]">
       <xsl:sort select="date" data-type="number"/>
      </xsl:apply-templates>
     </ul>
+    <hr />
+    <h1>Past Events</h1>
+    <ul>
+     <xsl:apply-templates select="events/event/deadline[date &lt; $today]">
+      <xsl:sort select="date" data-type="number" order="descending"/>
+     </xsl:apply-templates>
+    </ul>
     <xsl:call-template name="foot">
      <xsl:with-param name="path_to_top" select="'.'"/>
     </xsl:call-template>
@@ -37,15 +59,23 @@
 <xsl:template match="deadline">
  <li>
   <b>
-   <xsl:call-template name="print_date">
-    <xsl:with-param name="date" select="date/text()"/>
-   </xsl:call-template>
+   <xsl:variable name="kind">
+    <xsl:call-template name="color_of_deadline_kind">
+     <xsl:with-param name="kind" select="@kind"/>
+    </xsl:call-template>
+   </xsl:variable>
+   <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"/>
   <xsl:text> </xsl:text>
-  <a href="{../url}"><xsl:value-of select="../name"/></a>
+  <a href="{../url}" target="_top"><xsl:value-of select="../name"/></a>
  </li>
 </xsl:template>
 
 </xsl:stylesheet>
+
