From bff40bd0e806cf66c09fbc2020b1861dcd69c2af Mon Sep 17 00:00:00 2001
From: David Bartley <dtbartle@csclub.uwaterloo.ca>
Date: Sat, 14 Jul 2007 19:20:50 -0400
Subject: [PATCH] Added mediaitem "buttons" attribute to conditionally display
 digg/reddit buttons. Added "buttons" attribute to RMS page. Remoevd "Site
 Updated" section on main page.

---
 cscweb.xsl      | 59 ++++++++++++++++++++++++++-----------------------
 index.xml       |  8 -------
 media/index.xml |  2 +-
 3 files changed, 32 insertions(+), 37 deletions(-)

diff --git a/cscweb.xsl b/cscweb.xsl
index fb1be44..94b170a 100644
--- a/cscweb.xsl
+++ b/cscweb.xsl
@@ -139,36 +139,39 @@
  </xsl:if>
  <br/>
 
-<!-- Slashdot It link --> 
-<!-- <a 
-href="javascript:location.href='http://slashdot.org/bookmark.pl?url='+encodeURIComponent(location.href)"> <img src="http://images.slashdot.org/favicon.gif" alt="Slashdot" border="0" height="16" width="16"></img></a>
-<xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text>
-<a href="javascript:location.href='http://slashdot.org/bookmark.pl?url='+encodeURIComponent(location.href)">Slashdot It!</a> -->
+ <!-- AddThis Bookmark Button -->
+ <script type="text/javascript">
+   addthis_url    = location.href;
+   addthis_title  = document.title;
+   addthis_pub    = 'calumt';
+ </script><script type="text/javascript" src="http://s7.addthis.com/js/addthis_widget.php?v=12" ></script>
 
-<!-- AddThis Bookmark Button -->
-<script type="text/javascript">
-  addthis_url    = location.href;
-  addthis_title  = document.title;
-  addthis_pub    = 'calumt';
-</script><script type="text/javascript" src="http://s7.addthis.com/js/addthis_widget.php?v=12" ></script>
+ <xsl:if test="@buttons">
 
-<!-- digg button -->
-<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;
-google_ad_height = 90;
-google_ad_format = "728x90_as";
-google_ad_type = "text_image";
-//2007-03-21: mcc
-google_ad_channel = "1106187834";
-</script>
-<script type="text/javascript"
-  src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
--->
+  <br/><br/>
+  <!-- digg button -->
+  <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+
+  <!-- reddit button -->
+  <script language="javascript" src="http://reddit.com/button.js?t=3"></script>
+
+ </xsl:if>
+
+ <!-- google ads -->
+ <!--
+ <script type="text/javascript">
+ google_ad_client = "pub-5235744946475097";
+ google_ad_width = 728;
+ google_ad_height = 90;
+ google_ad_format = "728x90_as";
+ google_ad_type = "text_image";
+ //2007-03-21: mcc
+ google_ad_channel = "1106187834";
+ </script>
+ <script type="text/javascript"
+   src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+ </script>
+ -->
 
  <xsl:call-template name="footer"/>
 </body>
diff --git a/index.xml b/index.xml
index 6c165c9..4c26cb9 100644
--- a/index.xml
+++ b/index.xml
@@ -15,14 +15,6 @@
  </p>
  </section>
  
- <section title="Site Updated!">
- <p>
-   The design is now finalized. It is compatible with any browsers, especially
-   ones that recognize HTML 4.1, XML/XHTML 1.1 and CSS 3.0 (Stable
-   Specification).
- </p>
- </section>
-
  <section title="News and Upcoming Events">
   <news-and-events />
  </section>
diff --git a/media/index.xml b/media/index.xml
index 5b869a4..a8018ae 100644
--- a/media/index.xml
+++ b/media/index.xml
@@ -19,7 +19,7 @@
   <flvfile file="pmc-sasms-spring-2007.flv" />
 </mediaitem>
 
-<mediaitem title="Copyright vs Community in the Age of Computer Networks">
+<mediaitem title="Copyright vs Community in the Age of Computer Networks" buttons="true">
   <abstract>
     Copyright developed in the age of the printing press, and was designed to
     fit with the system of centralized copying imposed by the printing press.