From 9acbb46dab1fcd061fcfe0525c2b0940f5d1e3eb Mon Sep 17 00:00:00 2001
From: Holden Karau <hkarau@caffeine.csclub.uwaterloo.ca>
Date: Sun, 7 Oct 2007 04:16:11 -0400
Subject: [PATCH 1/3] Accept donations!

---
 about/Makefile      |  2 +-
 about/directory.xml |  1 +
 about/donations.xml | 47 +++++++++++++++++++++++++++++++++++++++++++++
 media/index.xml     | 16 +++++++--------
 xsl/functions.xsl   |  4 ++++
 xsl/media.xsl       |  2 ++
 6 files changed, 63 insertions(+), 9 deletions(-)
 create mode 100644 about/donations.xml

diff --git a/about/Makefile b/about/Makefile
index 255e57c..ef69851 100644
--- a/about/Makefile
+++ b/about/Makefile
@@ -1,4 +1,4 @@
-FILES = members.xml index.html exec.html members.html constitution.html \
+FILES = members.xml index.html exec.html members.html constitution.html donations.html \
     constitution-change-20020920.html constitution-change-20040205.html
 RELDIR = about/
 include ../common.mk
diff --git a/about/directory.xml b/about/directory.xml
index 54196e8..6e1d561 100644
--- a/about/directory.xml
+++ b/about/directory.xml
@@ -6,4 +6,5 @@
  <diritem title="Constitution" href="constitution.html" />
  <diritem title="The Executive" href="exec.html" />
  <diritem title="Membership List" href="members.html" />
+ <diritem title="Donations" href="donations.html" />
 </directory>
diff --git a/about/donations.xml b/about/donations.xml
new file mode 100644
index 0000000..8b768fe
--- /dev/null
+++ b/about/donations.xml
@@ -0,0 +1,47 @@
+<?xml version='1.0'?>
+
+<!DOCTYPE cscpage SYSTEM "../csc.dtd">
+
+<cscpage title="Donate to the University of Waterloo Computer Science Club">
+ <header />
+ 
+ <section title="Why should I donate?"> 
+  <p>
+	We use donations to help offset some of the cost from our talks. Things like having it recorded, paying transportation and hotel fees. We 
+also use donations to cover new hardware purchases to keep up with the demand that slashdot places on our servers.
+  </p>
+ </section>
+ <section title="How do I donate?">
+  <p>
+	The Computer Science club accepts almost all forms of donation. The easist and most convient is probably paypal
+<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+<input type="hidden" name="cmd" value="_xclick" />
+<input type="hidden" name="business" value="exec@csclub.uwaterloo.ca" />
+<input type="hidden" name="item_name" value="University of Waterloo Computer Science Club Donation" />
+<input type="hidden" name="buyer_credit_promo_code" value="" />
+<input type="hidden" name="buyer_credit_product_category" value="" />
+<input type="hidden" name="buyer_credit_shipping_method" value="" />
+<input type="hidden" name="buyer_credit_user_address_change" value="" />
+<input type="hidden" name="no_shipping" value="0" />
+<input type="hidden" name="no_note" value="1" />
+<input type="hidden" name="currency_code" value="CAD" />
+<input type="hidden" name="tax" value="0" />
+<input type="hidden" name="lc" value="CA" />
+<input type="hidden" name="bn" value="PP-DonationsBF" />
+<input type="image" src="https://www.paypal.com/en_US/i/btn/x-click-but21.gif" border="0" name="submit" alt="Make payments with PayPal - it's fast, free and secure!" />
+<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1" />
+</form>
+ so click the link and give us money :). We also accept cheques, goats, hardware, t-shirts, or pretty much anything that would be useful sent to our 
+mailing address. Before sending a goat (or similar), please e-mail <a href="mailto:exec@csclub.uwaterloo.ca">exec@csclub.uwaterloo.ca</a>
+  </p>
+<pre>Computer Science Club
+Math &amp; Computer 3036/3037
+University of Waterloo
+200 University Avenue West
+Waterloo, Ontario, CANADA
+N2L 3G1</pre>
+  <p>Our office phone number is (519) 888-4567 x33870.</p>
+ </section>
+
+ <footer />
+</cscpage>
diff --git a/media/index.xml b/media/index.xml
index 9546987..ffcb782 100644
--- a/media/index.xml
+++ b/media/index.xml
@@ -19,6 +19,14 @@ jeopradize informational privacy. Dr. Ann Cavoukian talks about how to use techn
 included instant messaging, RFID tags and Elliptical Curve Cryptography (ECC). Then Dr. Cavoukian explained the “7 Privacy – Embedded Laws” followed 
 by a discussion on a biometrics solution to encryption.
   </p>
+  </abstract>
+  <mediafile file="privacy.avi" type="XviD" />
+  <mediafile file="privacy.ogg" type="Ogg/Theora" />
+  <mediafile file="privacy.mp4" type="MP4" />
+  <mediafile file="privacy.mpg" type="MPG" />
+  <flvfile file="privacy.flv" />
+  <other>
+  <h2>Bio</h2>
   <p>
 Dr. Ann Cavoukian, as the Information and Privacy Commissioner, oversees the operations of Ontario's freedom of information and protection of 
 privacy laws, which apply to both provincial and municipal government organizations. She serves as an officer of the legislature, independent of the 
@@ -29,14 +37,6 @@ Psychology from the University of Toronto, where she specialized in criminology
 speaks extensively on the importance of privacy around the world. Her published works include a recent book on privacy called "Who Knows: 
 Safeguarding Your Privacy in a Networked World."
   </p>
-  </abstract>
-  <mediafile file="privacy.avi" type="XviD" />
-  <mediafile file="privacy.ogg" type="Ogg/Theora" />
-  <mediafile file="privacy.mp4" type="MP4" />
-  <mediafile file="privacy.mpg" type="MPG" />
-  <flvfile file="privacy.flv" />
-  <other>
-  <h2>Q&amp;A</h2>
   </other>
 </mediaitem>
 
diff --git a/xsl/functions.xsl b/xsl/functions.xsl
index 7817805..61feba4 100644
--- a/xsl/functions.xsl
+++ b/xsl/functions.xsl
@@ -33,6 +33,10 @@
   <xsl:value-of select="concat($term_text, $date_year)" />
 </xsl:function>
 
+<xsl:template name="donate-now">
+<p><a href="/about/donations.html">Donate to Computer Science Club and help us keep on doing what we do</a></p>
+</xsl:template>
+
 <xsl:template name="inline-ads">
 <!-- google ads -->
 <p>
diff --git a/xsl/media.xsl b/xsl/media.xsl
index e24efac..a394717 100644
--- a/xsl/media.xsl
+++ b/xsl/media.xsl
@@ -69,6 +69,7 @@
           <xsl:with-param name="title" select="@title" />
           <xsl:with-param name="href" select="concat(@title, $suffix, '.html')" />
         </xsl:call-template>
+	<xsl:call-template name="donate-now" />
         <xsl:if test="abstract">
           <h2>Abstract</h2>
           <div>
@@ -142,6 +143,7 @@
             <xsl:text> </xsl:text>
           </script>
         </p>
+	<xsl:call-template name="donate-now" />
         <xsl:if test="$ads">
           <xsl:call-template name="inline-ads" />
         </xsl:if>

From f14fe0cc5fb5bb0d220606d128945eca093dad69 Mon Sep 17 00:00:00 2001
From: root <root@caffeine.csclub.uwaterloo.ca>
Date: Sun, 7 Oct 2007 04:17:23 -0400
Subject: [PATCH 2/3] fake change

---
 about/donations.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/about/donations.xml b/about/donations.xml
index 8b768fe..8519ce4 100644
--- a/about/donations.xml
+++ b/about/donations.xml
@@ -8,7 +8,7 @@
  <section title="Why should I donate?"> 
   <p>
 	We use donations to help offset some of the cost from our talks. Things like having it recorded, paying transportation and hotel fees. We 
-also use donations to cover new hardware purchases to keep up with the demand that slashdot places on our servers.
+also use donations to cover new hardware purchases to keep up with the demand that slashdot places on our servers. 
   </p>
  </section>
  <section title="How do I donate?">

From 0c86f92d0636fb109bbf29f8ee1a6aedcbca49f5 Mon Sep 17 00:00:00 2001
From: Holden Karau <hkarau@caffeine.csclub.uwaterloo.ca>
Date: Sun, 7 Oct 2007 04:32:59 -0400
Subject: [PATCH 3/3] Update to be more general (theres digg too :P )

---
 about/donations.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/about/donations.xml b/about/donations.xml
index 8519ce4..9275dcc 100644
--- a/about/donations.xml
+++ b/about/donations.xml
@@ -8,7 +8,7 @@
  <section title="Why should I donate?"> 
   <p>
 	We use donations to help offset some of the cost from our talks. Things like having it recorded, paying transportation and hotel fees. We 
-also use donations to cover new hardware purchases to keep up with the demand that slashdot places on our servers. 
+also use donations to cover new hardware purchases to keep up with the demand that popular media files place on our servers. 
   </p>
  </section>
  <section title="How do I donate?">