Merge branch 'master' of caffeine.uwaterloo.ca:/users/www/www
[mspang/www.git] / xsl / common.xsl
index 520d54e..218f65d 100644 (file)
@@ -1,9 +1,11 @@
 <?xml version='1.0'?>
 
-<xsl:stylesheet version="1.0"
-    xmlns="http://www.w3.org/1999/xhtml"
+<xsl:stylesheet version="1.1"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:csc="http://csclub.uwaterloo.ca/xsltproc">
+    xmlns:csc="http://csclub.uwaterloo.ca/xsltproc"
+    xmlns="http://www.w3.org/1999/xhtml"
+    exclude-result-prefixes="csc">
+<xsl:output method="xml" />
 
 <xsl:template match="cscpage">
   <html>
 <xsl:template match="biglogo">
   <div class="biglogo">
     <div class="uwlogo">
-      <a href="http://www.uwaterloo.ca/"><img src="{$g_pre}logos/uw_logo.gif"
+      <a href="http://www.uwaterloo.ca/"><img src="{$g_pre}logos/uw_logo.png"
           alt="University of Waterloo" width="105" height="70" /></a>
     </div>
-    <div class="acmlogo">
-      <a href="http://www.acm.org"><img src="{$g_pre}logos/acm_logo.gif"
-           alt="A Student Chapter of the ACM" width="82" height="88" /></a>
-    </div>
     <div class="csclogo">
-      <a href="{$g_pre}index.html"><img src="{$g_pre}logos/csc_logo.gif"
+      <a href="{$g_pre}"><img src="{$g_pre}logos/csc_logo.png"
           alt="Computer Science Club" width="420" height="79" /></a>
     </div>
   </div>
-  <div class="template-header">
+  <div class="dirheader">
     <xsl:apply-templates
         select="document(concat($g_pwd, '/directory.xml'))/directory"/>
   </div>
   <xsl:param name="title" />
   <xsl:param name="href" />
   <div class="webtitle">
-    <a href="{$g_pre}"><img src="{$g_pre}logos/csc_title.gif"
+    <a href="{$g_pre}"><img src="{$g_pre}logos/csc_title.png"
         alt="CSC Logo" /></a>
   </div>
-  <div class="template-header">
+  <div class="dirheader">
     <xsl:apply-templates
         select="document(concat($g_pwd, '/directory.xml'))/directory"/>
     <xsl:if test="$title">
   <table cellspacing="1" cellpadding="2" class="newsandevents">
     <xsl:call-template name="events" />
     <xsl:call-template name="news" />
- </table>
 </table>
 </xsl:template>
 
 </xsl:stylesheet>