projects / matthijs / upstream / blosxom.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 862636f)
HTML 4.01 conformance for the default HTML templates
authorAxel Beckert <xtaran@users.sourceforge.net>
Tue, 24 Jun 2008 00:10:21 +0000 (00:10 +0000)
committerAxel Beckert <xtaran@users.sourceforge.net>
Tue, 24 Jun 2008 00:10:21 +0000 (00:10 +0000)
ChangeLog patch | blob | history
blosxom.cgi patch | blob | history
t/permalinks/expected.bar patch | blob | history
t/permalinks/expected.html patch | blob | history
t/smoketest/expected.html patch | blob | history
t/templates/data/head.html patch | blob | history
t/templates/expected.html patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index 5a05b0c9dd48e8ca4f23cf61c7d580d221101090..b52dccaa3fcc32d5be1d7ca9f58fc1279ce15001 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ v2.0.3
        * added support for external config file via BLOSXOM_CONFIG_DIR 
          and/or BLOSXOM_CONFIG_FILE environment variables
        * added support for $plugin_list plugin config file
+    * made the default templates conforming to HTML 4.01
 
 v2.0.2
        * fixed path_info to have correct extension in static mode (bug
diff --git a/blosxom.cgi b/blosxom.cgi
index 29b9a540d4ebf6022a0e38a47ba1cb9de0f799f8..674ff10f7a691e686b3d42cad6555ef2b76c3348 100755 (executable)
--- a/blosxom.cgi
+++ b/blosxom.cgi
@@ -735,34 +735,31 @@ sub nice_date {
 __DATA__
 html content_type text/html; charset=$blog_encoding
 
+html head <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 html head <html>
 html head     <head>
-html head         <meta http-equiv="content-type" content="text/html;charset=$blog_encoding" />
-html head         <link rel="alternate" type="application/rss+xml" title="RSS" href="$url/index.rss" />
-html head         <title>$blog_title $path_info_da $path_info_mo $path_info_yr
-html head         </title>
+html head         <meta http-equiv="content-type" content="text/html;charset=$blog_encoding" >
+html head         <link rel="alternate" type="application/rss+xml" title="RSS" href="$url/index.rss" >
+html head         <title>$blog_title $path_info_da $path_info_mo $path_info_yr</title>
 html head     </head>
 html head     <body>
-html head         <center>
-html head             <font size="+3">$blog_title</font><br />
-html head             $path_info_da $path_info_mo $path_info_yr
-html head         </center>
-html head         <p />
+html head         <div align="center">
+html head             <h1>$blog_title</h1>
+html head             <p>$path_info_da $path_info_mo $path_info_yr</p>
+html head         </div>
 
-html story        <p>
-html story            <a name="$fn"><b>$title</b></a><br />
-html story            $body<br />
-html story            <br />
-html story            posted at: $ti | path: <a href="$url$path">$path </a> | <a href="$url/$yr/$mo_num/$da#$fn">permanent link to this entry</a>
-html story        </p>
+html story         <div>
+html story             <h3><a name="$fn">$title</a></h3>
+html story             <div>$body</div>
+html story             <p>posted at: $ti | path: <a href="$url$path">$path</a> | <a href="$url/$yr/$mo_num/$da#$fn">permanent link to this entry</a></p>
+html story         </div>
 
-html date         <h3>$dw, $da $mo $yr</h3>
+html date         <h2>$dw, $da $mo $yr</h2>
 
 html foot
-html foot         <p />
-html foot         <center>
-html foot             <a href="http://blosxom.sourceforge.net/"><img src="http://blosxom.sourceforge.net/images/pb_blosxom.gif" border="0" /></a>
-html foot         </center>
+html foot         <div align="center">
+html foot             <a href="http://blosxom.sourceforge.net/"><img src="http://blosxom.sourceforge.net/images/pb_blosxom.gif" alt="powered by blosxom" border="0" width="90" height="33" ></a>
+html foot         </div>
 html foot     </body>
 html foot </html>
 
@@ -794,15 +791,17 @@ rss foot </rss>
 
 error content_type text/html
 
+error head <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 error head <html>
-error head <body>
-error head     <p><font color="red">Error: I'm afraid this is the first I've heard of a "$flavour" flavoured Blosxom.  Try dropping the "/+$flavour" bit from the end of the URL.</font></p>
+error head <head><title>Error: unknown Blosxom flavour "$flavour"</title></head>
+error head     <body>
+error head         <h1><font color="red">Error: unknown Blosxom flavour "$flavour"</font></h1>
+error head         <p>I'm afraid this is the first I've heard of a "$flavour" flavoured Blosxom.  Try dropping the "/+$flavour" bit from the end of the URL.</p>
 
+error story        <h3>$title</h3>
+error story        <div>$body</div> <p><a href="$url/$yr/$mo_num/$da#fn.$default_flavour">#</a></p>
 
-error story <p><b>$title</b><br />
-error story $body <a href="$url/$yr/$mo_num/$da#fn.$default_flavour">#</a></p>
-
-error date <h3>$dw, $da $mo $yr</h3>
+error date         <h2>$dw, $da $mo $yr</h2>
 
 error foot     </body>
 error foot </html>
diff --git a/t/permalinks/expected.bar b/t/permalinks/expected.bar
index c39e86fef9a99785a69cfe142d85953b9e7e87dd..883aa8537c423f87f7e32f9c9f4e2cbf17b75f1d 100644 (file)
--- a/t/permalinks/expected.bar
+++ b/t/permalinks/expected.bar
@@ -1,31 +1,28 @@
 Content-Type: text/html; charset=ISO-8859-1\r
 \r
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
     <head>
-        <meta http-equiv="content-type" content="text/html;charset=ISO-8859-1" />
-        <link rel="alternate" type="application/rss+xml" title="RSS" href="http://localhost/index.rss" />
-        <title>My Weblog   
-        </title>
+        <meta http-equiv="content-type" content="text/html;charset=ISO-8859-1" >
+        <link rel="alternate" type="application/rss+xml" title="RSS" href="http://localhost/index.rss" >
+        <title>My Weblog   </title>
     </head>
     <body>
-        <center>
-            <font size="+3">My Weblog</font><br />
-              
-        </center>
-        <p />
-        <h3>Tue, 25 Jul 2006</h3>
-       <p>
-           <a name="bar"><b>Lorem ipsum</b></a><br />
-           Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso
+        <div align="center">
+            <h1>My Weblog</h1>
+            <p>  </p>
+        </div>
+        <h2>Tue, 25 Jul 2006</h2>
+        <div>
+            <h3><a name="bar">Lorem ipsum</a></h3>
+            <div>Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso
 facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit
-amet ipso facto.Lorem ipsum dolor sit amet ipso facto. <br />
-           <br />
-           posted at: 11:02 | path: <a href="http://localhost/foo">/foo </a> | <a href="http://localhost/2006/07/25#bar">permanent link to this entry</a>
-       </p>
+amet ipso facto.Lorem ipsum dolor sit amet ipso facto. </div>
+            <p>posted at: 11:02 | path: <a href="http://localhost/foo">/foo</a> | <a href="http://localhost/2006/07/25#bar">permanent link to this entry</a></p>
+        </div>
 
-        <p />
-        <center>
-            <a href="http://blosxom.sourceforge.net/"><img src="http://blosxom.sourceforge.net/images/pb_blosxom.gif" border="0" /></a>
-        </center>
+        <div align="center">
+            <a href="http://blosxom.sourceforge.net/"><img src="http://blosxom.sourceforge.net/images/pb_blosxom.gif" alt="powered by blosxom" border="0" width="90" height="33" ></a>
+        </div>
     </body>
 </html>
diff --git a/t/permalinks/expected.html b/t/permalinks/expected.html
index 35772383be9f851b315bffe4eba95d3eb4f27d4d..5781a528e59710c4df939c35e6aa25268fefa8a8 100644 (file)
--- a/t/permalinks/expected.html
+++ b/t/permalinks/expected.html
@@ -1,43 +1,39 @@
 Content-Type: text/html; charset=ISO-8859-1\r
 \r
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
     <head>
-        <meta http-equiv="content-type" content="text/html;charset=ISO-8859-1" />
-        <link rel="alternate" type="application/rss+xml" title="RSS" href="http://localhost/index.rss" />
-        <title>My Weblog   
-        </title>
+        <meta http-equiv="content-type" content="text/html;charset=ISO-8859-1" >
+        <link rel="alternate" type="application/rss+xml" title="RSS" href="http://localhost/index.rss" >
+        <title>My Weblog   </title>
     </head>
     <body>
-        <center>
-            <font size="+3">My Weblog</font><br />
-              
-        </center>
-        <p />
-        <h3>Tue, 25 Jul 2006</h3>
-       <p>
-           <a name="baz"><b>Lorem ipso</b></a><br />
-           Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz
+        <div align="center">
+            <h1>My Weblog</h1>
+            <p>  </p>
+        </div>
+        <h2>Tue, 25 Jul 2006</h2>
+        <div>
+            <h3><a name="baz">Lorem ipso</a></h3>
+            <div>Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz
 de ramas cora dola tymon ipso hoccer. Lorem ipso foer tyr wuz de ramas
 cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym
 ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas
 cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon
 ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer
-tyr wuz de ramas cora dola tym ipso hor.<br />
-           <br />
-           posted at: 11:03 | path: <a href="http://localhost/foo">/foo </a> | <a href="http://localhost/2006/07/25#baz">permanent link to this entry</a>
-       </p>
-       <p>
-           <a name="bar"><b>Lorem ipsum</b></a><br />
-           Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso
+tyr wuz de ramas cora dola tym ipso hor.</div>
+            <p>posted at: 11:03 | path: <a href="http://localhost/foo">/foo</a> | <a href="http://localhost/2006/07/25#baz">permanent link to this entry</a></p>
+        </div>
+        <div>
+            <h3><a name="bar">Lorem ipsum</a></h3>
+            <div>Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso
 facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit
-amet ipso facto.Lorem ipsum dolor sit amet ipso facto. <br />
-           <br />
-           posted at: 11:02 | path: <a href="http://localhost/foo">/foo </a> | <a href="http://localhost/2006/07/25#bar">permanent link to this entry</a>
-       </p>
+amet ipso facto.Lorem ipsum dolor sit amet ipso facto. </div>
+            <p>posted at: 11:02 | path: <a href="http://localhost/foo">/foo</a> | <a href="http://localhost/2006/07/25#bar">permanent link to this entry</a></p>
+        </div>
 
-        <p />
-        <center>
-            <a href="http://blosxom.sourceforge.net/"><img src="http://blosxom.sourceforge.net/images/pb_blosxom.gif" border="0" /></a>
-        </center>
+        <div align="center">
+            <a href="http://blosxom.sourceforge.net/"><img src="http://blosxom.sourceforge.net/images/pb_blosxom.gif" alt="powered by blosxom" border="0" width="90" height="33" ></a>
+        </div>
     </body>
 </html>
diff --git a/t/smoketest/expected.html b/t/smoketest/expected.html
index 63a7e65634987a45b601f89c54dfdd0b727afd6c..6766b360fbda9b90e0cd60be3c7de444b132f522 100644 (file)
--- a/t/smoketest/expected.html
+++ b/t/smoketest/expected.html
@@ -1,22 +1,21 @@
 Content-Type: text/html; charset=ISO-8859-1\r
 \r
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
     <head>
-        <meta http-equiv="content-type" content="text/html;charset=ISO-8859-1" />
-        <link rel="alternate" type="application/rss+xml" title="RSS" href="http://localhost/index.rss" />
-        <title>My Weblog   
-        </title>
+        <meta http-equiv="content-type" content="text/html;charset=ISO-8859-1" >
+        <link rel="alternate" type="application/rss+xml" title="RSS" href="http://localhost/index.rss" >
+        <title>My Weblog   </title>
     </head>
     <body>
-        <center>
-            <font size="+3">My Weblog</font><br />
-              
-        </center>
-        <p />
-        <h3>Wed, 19 Jul 2006</h3>
-       <p>
-           <a name="1"><b>Lorem ipsum</b></a><br />
-           Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso
+        <div align="center">
+            <h1>My Weblog</h1>
+            <p>  </p>
+        </div>
+        <h2>Wed, 19 Jul 2006</h2>
+        <div>
+            <h3><a name="1">Lorem ipsum</a></h3>
+            <div>Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso
 facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit
 amet ipso facto.Lorem ipsum dolor sit amet ipso facto. 
 
@@ -30,14 +29,12 @@ cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym
 ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas
 cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon
 ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer
-tyr wuz de ramas cora dola tym ipso hor.<br />
-           <br />
-           posted at: 22:54 | path: <a href="http://localhost"> </a> | <a href="http://localhost/2006/07/19#1">permanent link to this entry</a>
-       </p>
+tyr wuz de ramas cora dola tym ipso hor.</div>
+            <p>posted at: 22:54 | path: <a href="http://localhost"></a> | <a href="http://localhost/2006/07/19#1">permanent link to this entry</a></p>
+        </div>
 
-        <p />
-        <center>
-            <a href="http://blosxom.sourceforge.net/"><img src="http://blosxom.sourceforge.net/images/pb_blosxom.gif" border="0" /></a>
-        </center>
+        <div align="center">
+            <a href="http://blosxom.sourceforge.net/"><img src="http://blosxom.sourceforge.net/images/pb_blosxom.gif" alt="powered by blosxom" border="0" width="90" height="33" ></a>
+        </div>
     </body>
 </html>
diff --git a/t/templates/data/head.html b/t/templates/data/head.html
index 7426227d41899cb3e7dd31df7f534fe335727f16..17c175363b3997316707591b46100c50d794327f 100644 (file)
--- a/t/templates/data/head.html
+++ b/t/templates/data/head.html
@@ -2,9 +2,8 @@
           "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
     <head>
-        <link rel="alternate" type="application/rss+xml" title="RSS" href="$url/index.rss" />
-        <title>$blog_title $path_info_da $path_info_mo $path_info_yr
-        </title>
+        <link rel="alternate" type="application/rss+xml" title="RSS" href="$url/index.rss" >
+        <title>$blog_title $path_info_da $path_info_mo $path_info_yr</title>
     </head>
     <body>
         <h1>$blog_title</h1>
diff --git a/t/templates/expected.html b/t/templates/expected.html
index b0714d83569c04e5a8e7b6617bd9df26eb699898..c068b5742bad6d10604e471432be3124dfa59f58 100644 (file)
--- a/t/templates/expected.html
+++ b/t/templates/expected.html
@@ -4,9 +4,8 @@ Content-Type: text/xhtml; charset=UTF-8
           "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
     <head>
-        <link rel="alternate" type="application/rss+xml" title="RSS" href="http://localhost/index.rss" />
-        <title>My Weblog   
-        </title>
+        <link rel="alternate" type="application/rss+xml" title="RSS" href="http://localhost/index.rss" >
+        <title>My Weblog   </title>
     </head>
     <body>
         <h1>My Weblog</h1>
Blosxom blogging script repository with my patches