Merge branch 'master' of caffeine:/users/www/www/

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

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>

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 popular media files place 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>

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>
 

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>

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>