From e3438e6e560f5250bf98bdada51894bafee6afe0 Mon Sep 17 00:00:00 2001
From: David Bartley <dtbartle@csclub.uwaterloo.ca>
Date: Fri, 13 Jul 2007 03:11:27 -0400
Subject: [PATCH] Added "View" and "Download" sections to the media pages Made
 "Abstract", "View", and "Download" sections conditionally display Removed
 trivial abstracts as per above change Added preview attribute for flvplayer

---
 cscweb.xsl      | 53 ++++++++++++++++++++++++++-----------------------
 media/index.xml | 16 ++++++---------
 2 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/cscweb.xsl b/cscweb.xsl
index 08a6fdf..d636fbd 100644
--- a/cscweb.xsl
+++ b/cscweb.xsl
@@ -70,7 +70,9 @@
     var s1 = new SWFObject("flash/flvplayer.swf","single","400","300","7");
     s1.addParam("allowfullscreen","true");
     s1.addVariable("file","http://csclub.uwaterloo.ca/files/<xsl:value-of select="@file" />");
-<!--    s1.addVariable("image","preview.jpg"); -->
+    <xsl:if test="@preview">
+    s1.addVariable("image","<xsl:value-of select="@preview" />");
+    </xsl:if>
     s1.write("player1");
   </script>
 </xsl:template>
@@ -92,36 +94,37 @@
  <xsl:call-template name="header">
   <xsl:with-param name="title" select="@title"/>
  </xsl:call-template>
+
+ <xsl:if test="abstract">
  <h2>Abstract</h2>
  <p>
- <xsl:apply-templates select="abstract"/>
- </p>
- <xsl:apply-templates select="flvfile">
- </xsl:apply-templates>
- <p>
+  <xsl:apply-templates select="abstract"/>
  </p>
+ </xsl:if>
 
+ <xsl:if test="flvfile">
+ <h2>View</h2>
  <p>
- Download "<xsl:value-of select="@title"/>" in a number of formats via 
- <strong><ul>
-  <li>HTTP (web browser):
-   <xsl:apply-templates select="mediafile">
-    <xsl:with-param name="ext"></xsl:with-param>
-   </xsl:apply-templates>
-  </li>
-  <br/>
-  <li>BitTorrent:
-   <xsl:apply-templates select="mediafile" >
-    <xsl:with-param name="ext">.torrent</xsl:with-param>
-   </xsl:apply-templates>
-  </li>
-<!--  <li>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>
-  </li> -->
- </ul></strong>
+  <xsl:apply-templates select="flvfile">
+  </xsl:apply-templates>
  </p>
+ </xsl:if>
+
+ <xsl:if test="mediafile">
+ <h2>Download</h2>
+ <p><strong>
+  HTTP (web browser):
+  <xsl:apply-templates select="mediafile">
+   <xsl:with-param name="ext"></xsl:with-param>
+  </xsl:apply-templates>
+  <br/><br/>
+  BitTorrent:
+  <xsl:apply-templates select="mediafile" >
+  <xsl:with-param name="ext">.torrent</xsl:with-param>
+  </xsl:apply-templates>
+ </strong></p>
+ </xsl:if>
+ <br/>
 
 <!-- Slashdot It link --> 
 <!-- <a 
diff --git a/media/index.xml b/media/index.xml
index 2ea6d9e..75ec8b1 100644
--- a/media/index.xml
+++ b/media/index.xml
@@ -5,16 +5,13 @@
 <header/>
   <section title="CSC Media">
     Here you will find a wide variety of audio and video recordings of past 
-    CSC Talks. Some of these files are very large, and we do not recommend 
-    attempting to stream them. Most of these should be available upon request 
-    at the Computer Science Club office to be burnt to CD or DVD should you 
-    so choose.
+    CSC and other unversity-related talks. Some of these files are very large, 
+    and we do not recommend attempting to stream them. Most of these should be 
+    available upon request at the Computer Science Club office to be burnt to 
+    CD or DVD should you so choose.
     <ul>
 
 <mediaitem title="PMAMC&amp;OC SASMS - Spring 2007">
-  <abstract>
-    PMAMC&amp;OC SASMS - Spring 2007
-  </abstract>
   <mediafile file="pmc-sasms-spring-2007.avi" type="XviD" size="643M" />
   <mediafile file="pmc-sasms-spring-2007.ogg" type="OGG/Theora" size="598M" />
   <mediafile file="pmc-sasms-spring-2007.mp4" type="MP4" size="625M" />
@@ -32,8 +29,8 @@
     The global corporations that profit from copyright are lobbying for
     draconian punishments, and to increase their copyright powers, while
     suppressing public access to technology. But if we seriously hope to serve
-    the only legitimate purpose of copyright--to promote progress, for the
-    benefit of the public--then we must make changes in the other direction.
+    the only legitimate purpose of copyright -- to promote progress, for the
+    benefit of the public -- then we must make changes in the other direction.
   </abstract>
 </mediaitem>
 
@@ -344,7 +341,6 @@
 </mediaitem>
 
 <mediaitem title="Larry Smith: Computing's Next Great Empires">
-  <abstract>Not available</abstract>
   <mediafile file="larry-smith-talk.ogg" type="OGG" />
   <mediafile file="larry-smith-talk.mp3" type="MP3" />
 </mediaitem>