From 72dedae898820807b2c1df688befc714f7a80371 Mon Sep 17 00:00:00 2001
From: Webmaster <www@csclub.uwaterloo.ca>
Date: Tue, 27 Mar 2007 18:00:29 +0000
Subject: [PATCH] Updated events

---
 cscweb.xsl      | 16 +++++++++-------
 events.xml      | 10 +++++-----
 media/index.xml |  7 +++++--
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/cscweb.xsl b/cscweb.xsl
index 90bf2f5..4e6398d 100755
--- a/cscweb.xsl
+++ b/cscweb.xsl
@@ -90,7 +90,7 @@
  </xsl:apply-templates>
 </li>
 <li>
- via dijjer (a mostly seemless bittorrent alternative):
+ via dijjer (a mostly seamless bittorrent alternative):
  <xsl:apply-templates select="mediafile" >
  <xsl:with-param name="pre">http://dijjer.org/get/http://www.csclub.uwaterloo.ca</xsl:with-param>
  </xsl:apply-templates>
@@ -105,6 +105,7 @@
 </p>
 <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
 <script language="javascript" src="http://reddit.com/button.js?t=3"></script>
+<!--
 <script type="text/javascript">
 google_ad_client = "pub-5235744946475097";
 google_ad_width = 728;
@@ -117,6 +118,7 @@ google_ad_channel = "1106187834";
 <script type="text/javascript"
   src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
 </script>
+-->
  <xsl:call-template name="footer"/>
 </body>
 </html>
@@ -127,7 +129,7 @@ google_ad_channel = "1106187834";
 <xsl:template match="menuitem">
     <td align="center" class="menuitem">
      <a href="{@href}"><img border="0" src="/buttons/{@icon}.png"
-     width="40" height="40" alt="" /><!--</a>--><br />
+     width="40" height="40" alt="{@title}" /><!--</a>--><br />
      <!--<a href="{@href}">--><xsl:value-of select="@title"/></a>
     </td>
 </xsl:template>
@@ -152,9 +154,9 @@ google_ad_channel = "1106187834";
   <div class="webtitle"><div class="webtitle-inner">
   <table cellpadding="0" cellspacing="0" border="0" align="left"><tr>
     <td width="90">
-      <a href="/"><img src="/logos/csc_80_35_white.png"/></a>
+      <a href="/"><img src="/logos/csc_80_35_white.png" alt="CSC Logo" /></a>
     </td><td>
-      <a href="/"><img src="/logos/csc_title.png"/></a>
+      <a href="/"><img src="/logos/csc_title.png" alt="CSC Title" /></a>
     </td><td valign="top" align="right">
     </td>
   </tr></table>
@@ -201,7 +203,7 @@ google_ad_channel = "1106187834";
   may find, including the version of your browser and your operating system.
  </p>
  <p>
-   <a href="/"><img src="/logos/csc_80_35.png" align="right"/></a>
+   <a href="/"><img src="/logos/csc_80_35.png" alt="CSC" align="right"/></a>
    Copyright
    <xsl:text disable-output-escaping="yes">&amp;copy;</xsl:text>
    2002<xsl:text disable-output-escaping="yes">&amp;ndash;</xsl:text>2007
@@ -253,7 +255,7 @@ google_ad_channel = "1106187834";
 <xsl:template match="events" name="events">
    <tr>
     <th colspan="2" class="news" bgcolor="#aaaaff">
-     Upcoming Events
+     Upcoming Events <a href="events.ics">ical</a>
     </th>
    </tr>
    <xsl:for-each select="document('events.xml')/eventdefs/eventitem">
@@ -322,7 +324,7 @@ google_ad_channel = "1106187834";
 </xsl:template>
 
 <xsl:template match="events-this-term" name="events-by-term">
-  <p>The events for <xsl:value-of select="csc:term($date)"/> are listed here.</p>
+  <p>The events for <xsl:value-of select="csc:term($date)"/> are listed here or grab an <a href="/events.ics">ical</a>.</p>
    <xsl:for-each select="document('events.xml')/eventdefs/eventitem">
     <xsl:sort select="translate(@date, '-', '')"
               order="ascending"
diff --git a/events.xml b/events.xml
index 5d332ce..1225abe 100755
--- a/events.xml
+++ b/events.xml
@@ -4,7 +4,7 @@
 
   <eventitem date="2007-04-11" time="3:30 PM"
         room="Hagey Hall" title="The Free Software Movement and the GNU/Linux Operating System">
-        <short>A talk by Richard M. Stallman (RMS) [CANCELLED]!</short>
+        <short>A talk by Richard M. Stallman (RMS) <b>[CANCELLED]!</b></short>
         <abstract>
         <p>
 <!--	Richard Stallman will speak about the goals and philosophy of the Free Software Movement, and the status and history the GNU operating 
@@ -28,7 +28,7 @@ Richard Stallman has cancelled his trip to Canada.
 
 
   <eventitem date="2007-03-28" time="4:30 PM"
-   room="TBA" title="Computational Physics Simulations">
+   room="MC 1056" title="Computational Physics Simulations">
    <short>A talk by David Tenty and Alex Parent</short>
    <abstract>
    <p>
@@ -40,7 +40,7 @@ Richard Stallman has cancelled his trip to Canada.
 
 
   <eventitem date="2007-03-29" time="4:30 PM"
-   room="TBA" title="All The Code">
+   room="MC 1056" title="All The Code">
    <short>A demo/intrdocution to a new source code search engine. A talk by Holden Karau</short>
    <abstract>
    <p>
@@ -56,8 +56,8 @@ The talk will primarily be a demo of All The Code, along with a brief discussion
   </eventitem>
 
 
-  <eventitem date="2007-03-27" time="4:30 PM"
-   room="TBA" title="TBA">
+  <eventitem date="2007-03-30" time="4:30 PM"
+   room="MC 1056" title="TBA">
    <short>A talk by Michael Biggs</short>
    <abstract>
    <p>
diff --git a/media/index.xml b/media/index.xml
index f9ceda3..0941cd1 100755
--- a/media/index.xml
+++ b/media/index.xml
@@ -224,9 +224,12 @@ however, to be the unrivalled price-to-performance ratio.
 A discussion of how software creators can identify application opportunities that offer the promise of great social and commercial significance. 
 Particular attention will be paid to the challenge of acquiring cross domain knowledge and setting up effective collaboration.
 		</abstract>
-		<mediafile file="larry-smith-divx-low.avi" size="920M" type="DiVX" />
+		<mediafile file="larry-killer-applications.avi" size="686M" type="DiVX" />
+		<mediafile file="larry-killer-applications-xvid.avi" size="686M" type="XviD" />
+		<mediafile file="larry-killer-applications.mpg" size="685M" type="MPG" />
+		<mediafile file="larry-killer-applications.ogg" size="706M" type="OGG" />
 		<mediafile file="larry-smith-wmv.wmv" size="312M" type="Windows Media" />
-		<mediafile file="larry-smith-mov.mov" size="1.4G" type="Quick Time" />
+		<mediafile file="larry-smith-quicktime.mov" size="1.4G" type="Quick Time" />
 	</mediaitem>
 	<li>Larry Smith: Computing's Next Great Empires <a href="/audio/Larry%20Smith%20Talk.ogg">ogg</a><a href="/audio/Larry%20Smith%20Talk.mp3">mp3</a></li>
 	<mediaitem title="Rico Mariani: Eighteen Years in the Software Tools Business">