From c84168f63d2fce9985bb31f0807a47edd029c8ac 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

---
 cscweb.xsl      | 49 +++++++++++++++++++++++++------------------------
 media/index.xml |  4 ----
 2 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/cscweb.xsl b/cscweb.xsl
index 08a6fdf..1cca231 100644
--- a/cscweb.xsl
+++ b/cscweb.xsl
@@ -92,36 +92,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..13d6c80 100644
--- a/media/index.xml
+++ b/media/index.xml
@@ -12,9 +12,6 @@
     <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" />
@@ -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>