Fix double-list on media page and ResNet text in media pages.

xsl/media.xsl

@@ -31,16 +31,19 @@
 <xsl:template match="mediaitem">
   <xsl:call-template name="makemediaitem">
     <xsl:with-param name="mirror" select="$mirror_csc" />
-    <xsl:with-param name="bittorrent">true</xsl:with-param>
+    <xsl:with-param name="bittorrent">yes</xsl:with-param>
   </xsl:call-template>
   <xsl:call-template name="makemediaitem">
     <xsl:with-param name="suffix">-uw</xsl:with-param>
     <xsl:with-param name="infotext">
-      If you are in residence, downloading these files will not count against
-      your ResNet quota.<br/><br/>
+      <p>
+        If you are in residence, downloading these files will not count 
+        against your ResNet quota.
+      </p>
     </xsl:with-param>
     <xsl:with-param name="mirror" select="$mirror_cs" />
   </xsl:call-template>
+  <li><a href= "{@title}.html"><xsl:value-of select="@title" /></a></li>
 </xsl:template>
 
 <xsl:template name="makemediaitem">
@@ -76,12 +79,12 @@
         <xsl:if test="mediafile">
           <h2>Download</h2>
           <div><strong>
-            <xsl:value-of select="$infotext" />
+            <xsl:copy-of select="$infotext" />
             HTTP (web browser):
               <xsl:apply-templates select="mediafile">
                 <xsl:with-param name="mirror" select="$mirror" />
               </xsl:apply-templates>
-            <xsl:if test="$bittorrent">
+            <xsl:if test="$bittorrent = 'yes'">
               <br/><br/>
               BitTorrent:
               <xsl:apply-templates select="mediafile">
@@ -132,7 +135,6 @@
       </div></body>
     </html>
   </xsl:result-document>
-  <li><a href= "{@title}.html"><xsl:value-of select="@title" /></a></li>
 </xsl:template>
 
 </xsl:stylesheet>