From fea80372455e060fa2e8967f6548a0c182019acb Mon Sep 17 00:00:00 2001
From: David Bartley <dtbartle@csclub.uwaterloo.ca>
Date: Thu, 12 Jun 2008 16:02:09 -0400
Subject: [PATCH] No need for mirror.cs anymore

---
 buttons/Makefile | 5 ++---
 xsl/html.xsl     | 3 +--
 xsl/media.xsl    | 9 +++------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/buttons/Makefile b/buttons/Makefile
index 305e03d..56201dd 100644
--- a/buttons/Makefile
+++ b/buttons/Makefile
@@ -1,5 +1,4 @@
-FILES = about.png events.png gitweb.png home.png library.png mailman.png \
-	media.png office.png services.png stats.png webmail.png wiki.png \
-	gallery.png
+FILES = about.png events.png gitweb.png home.png mailman.png media.png \
+	office.png services.png stats.png webmail.png wiki.png gallery.png
 RELDIR = buttons/
 include ../common.mk
diff --git a/xsl/html.xsl b/xsl/html.xsl
index adf905b..9aaf18e 100644
--- a/xsl/html.xsl
+++ b/xsl/html.xsl
@@ -31,8 +31,7 @@
 </xsl:variable>
 
 <!-- mirror variables -->
-<xsl:variable name="g_mirror_csc">http://csclub.uwaterloo.ca/files/</xsl:variable>
-<xsl:variable name="g_mirror_cs">http://mirror.cs.uwaterloo.ca/csclub/</xsl:variable>
+<xsl:variable name="g_mirror">http://mirror.csclub.uwaterloo.ca/csclub/</xsl:variable>
 
 <!-- include additional style sheets -->
 <xsl:include href="functions.xsl" />
diff --git a/xsl/media.xsl b/xsl/media.xsl
index 19c44fb..42910fd 100644
--- a/xsl/media.xsl
+++ b/xsl/media.xsl
@@ -32,7 +32,6 @@
 
 <xsl:template match="mediaitem">
   <xsl:call-template name="makemediaitem">
-    <xsl:with-param name="mirror" select="$g_mirror_csc" />
     <xsl:with-param name="bittorrent">yes</xsl:with-param>
   </xsl:call-template>
   <xsl:call-template name="makemediaitem">
@@ -43,7 +42,6 @@
         against your ResNet quota.
       </p>
     </xsl:with-param>
-    <xsl:with-param name="mirror" select="$g_mirror_cs" />
   </xsl:call-template>
   <li><a href= "{@title}"><xsl:value-of select="@title" /></a></li>
 </xsl:template>
@@ -51,7 +49,6 @@
 <xsl:template name="makemediaitem">
   <xsl:param name="suffix" />
   <xsl:param name="infotext" />
-  <xsl:param name="mirror" />
   <xsl:param name="bittorrent" />
   <xsl:param name="ads" />
   <xsl:variable name="realurl" select="concat('http://csclub.uwaterloo.ca/media/', csc:encode-for-uri(@title))" />
@@ -83,7 +80,7 @@
           <h2>View</h2>
         <div>
           <xsl:apply-templates select="flvfile">
-            <xsl:with-param name="mirror" select="$mirror" />
+            <xsl:with-param name="mirror" select="$g_mirror" />
           </xsl:apply-templates>
         </div>
         </xsl:if>
@@ -96,14 +93,14 @@
                 BitTorrent:
                 <xsl:apply-templates select="mediafile">
                   <xsl:with-param name="ext">.torrent</xsl:with-param>
-                  <xsl:with-param name="mirror" select="$mirror" />
+                  <xsl:with-param name="mirror" select="$g_mirror" />
                 </xsl:apply-templates>
               </p>
             </xsl:if>
             <p class="mediafile">
               HTTP (web browser):
               <xsl:apply-templates select="mediafile">
-                <xsl:with-param name="mirror" select="$mirror" />
+                <xsl:with-param name="mirror" select="$g_mirror" />
               </xsl:apply-templates>
             </p>
           </div>