Make website XHTML 1.1 compliant

16 years ago · 90d60bd208
parent 99fe774447
commit 90d60bd208
5 changed files with 16 additions and 14 deletions
--- a/xsl/common.xsl
+++ b/xsl/common.xsl
@ -30,7 +30,7 @@

 <xsl:template match="section">
  <xsl:if test="@anchor">
-    <a name="{@anchor}" />
+    <a id="{@anchor}" />
  </xsl:if>
  <h2><xsl:value-of select="@title" /></h2>
  <xsl:apply-templates />
@ -102,8 +102,8 @@
    </div>
    <p>
      <a href="http://validator.w3.org/check?uri=referer">
-      <img src="http://www.w3.org/Icons/valid-xhtml10"
-          alt="Valid XHTML 1.0 Strict" height="31" width="88" />
+      <img src="http://www.w3.org/Icons/valid-xhtml11"
+          alt="Valid XHTML 1.1" height="31" width="88" />
      </a>
      <a href="http://jigsaw.w3.org/css-validator/check/referer">
      <img style="border:0;width:88px;height:31px"
--- a/xsl/events.xsl
+++ b/xsl/events.xsl
@ -72,8 +72,8 @@

 <xsl:template match="eventitem">
  <xsl:result-document method="xml" encoding="ISO-8859-1"
-      doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
-      doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
+      doctype-public="-//W3C//DTD XHTML 1.1//EN"
+      doctype-system="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"
      href="{translate(concat($g_outdir, @room, '-', @date, '-', @time, '.html'), ' ', '_')}">
    <html>
      <head>
@ -112,8 +112,8 @@
        <xsl:value-of select="csc:term(@date)" />
      </a></p>
      <xsl:result-document method="xml" encoding="ISO-8859-1"
-            doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
-            doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
+            doctype-public="-//W3C//DTD XHTML 1.1//EN"
+            doctype-system="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"
            href="{translate(concat($g_outdir, 'old-', csc:term(@date), '.html'), ' ', '_')}">
        <html>
          <head>
--- a/xsl/html.xsl
+++ b/xsl/html.xsl
@ -31,7 +31,9 @@
 <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:output method="xml" encoding="ISO-8859-1" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" />
+<xsl:output method="xml" encoding="ISO-8859-1"
+    doctype-public="-//W3C//DTD XHTML 1.1//EN"
+    doctype-system="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" />

 <!-- include additional style sheets -->
 <xsl:include href="functions.xsl" />
--- a/xsl/media.xsl
+++ b/xsl/media.xsl
@ -56,8 +56,8 @@
  <xsl:param name="ads" />
  <xsl:variable name="realurl" select="concat('http://csclub.uwaterloo.ca/media/', fn:encode-for-uri(@title), '.html')" />
  <xsl:result-document method="xml" encoding="ISO-8859-1"
-      doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
-      doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
+      doctype-public="-//W3C//DTD XHTML 1.1//EN"
+      doctype-system="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"
      href="{concat($g_outdir, @title, $suffix, '.html')}">
    <html>
      <head>
@ -87,7 +87,7 @@
        <xsl:if test="mediafile">
          <h2>Download</h2>
          <div>
-            <xsl:copy-of select="$infotext" />
+            <xsl:apply-templates select="$infotext" />
            <xsl:if test="$bittorrent = 'yes'">
              <p class="mediafile">
                BitTorrent:
@ -128,7 +128,7 @@
        </xsl:if>
        <xsl:if test="other">
        <div>
-          <xsl:copy-of select="other/node()"/>
+          <xsl:apply-templates select="other/node()" />
          </div>
        </xsl:if>
        <p>
--- a/xsl/news.xsl
+++ b/xsl/news.xsl
@ -66,8 +66,8 @@
        <xsl:value-of select="csc:term(@date)" />
      </a></p>
      <xsl:result-document method="xml" encoding="ISO-8859-1"
-          doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
-          doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
+          doctype-public="-//W3C//DTD XHTML 1.1//EN"
+          doctype-system="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"
          href="{translate(concat($g_outdir, 'old-', csc:term(@date), '.html'), ' ', '_')}">
        <html>
          <head>