From ff15bad19c882a883f580d902029e49ec8974bc5 Mon Sep 17 00:00:00 2001
From: David Bartley <dtbartle@csclub.uwaterloo.ca>
Date: Tue, 9 Sep 2008 10:32:18 -0400
Subject: [PATCH] Add election information

---
 events.xml     | 13 +++++++++++++
 xsl/events.xsl |  7 ++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/events.xml b/events.xml
index 1a50be7..f61f380 100644
--- a/events.xml
+++ b/events.xml
@@ -3,6 +3,19 @@
 <!DOCTYPE eventdefs SYSTEM "csc.dtd">
 <eventdefs>
 
+<!-- Fall 2008 -->
+
+<eventitem date="2008-09-16" time="4:30 PM" room="Comfy Lounge" title="CSClub Elections">
+  <short><p>
+    Elections are scheduled for Tues, Sep 16 @ 4:30 pm in the comfy lounge.
+    The nomination period closes on Mon, Sep 15 @ 4:30 pm. Nominations may be
+    sent to cro@csclub.uwaterloo.ca. Candidates should not engage in
+    campaigning after the nomination period has closed.
+  </p></short>
+</eventitem>
+
+<!-- Spring 2008 -->
+
 <!-- Winter 2008 -->
 
 <eventitem date="2008-02-08" time="4:30 PM" room="MC4042" title="A Brief History of Blackberry and the Wireless Data Telecom Industry">
diff --git a/xsl/events.xsl b/xsl/events.xsl
index 7d0f7ce..3306016 100644
--- a/xsl/events.xsl
+++ b/xsl/events.xsl
@@ -92,7 +92,12 @@
           </p>
         </div>
         <h2>Abstract</h2>
-        <xsl:apply-templates select="abstract/node()" />
+        <xsl:if test="abstract">
+          <xsl:apply-templates select="abstract/node()" />
+        </xsl:if>
+        <xsl:if test="not(abstract)">
+          <xsl:apply-templates select="short/node()" />
+        </xsl:if>
         <xsl:call-template name="footer" />
       </div></body>
     </html>