From: Axel Beckert Date: Tue, 24 Jun 2008 00:10:21 +0000 (+0000) Subject: HTML 4.01 conformance for the default HTML templates X-Git-Tag: v2_1_0~19 X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fblosxom.git;a=commitdiff_plain;h=9f94051f5dd9294a6d2a6e474087dd94bf1ebfe4 HTML 4.01 conformance for the default HTML templates --- diff --git a/ChangeLog b/ChangeLog index 5a05b0c..b52dcca 100644 --- 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 29b9a54..674ff10 100755 --- a/blosxom.cgi +++ b/blosxom.cgi @@ -735,34 +735,31 @@ sub nice_date { __DATA__ html content_type text/html; charset=$blog_encoding +html head html head html head -html head -html head -html head $blog_title $path_info_da $path_info_mo $path_info_yr -html head +html head +html head +html head $blog_title $path_info_da $path_info_mo $path_info_yr html head html head -html head -html head $blog_title
-html head $path_info_da $path_info_mo $path_info_yr -html head -html head

+html head

$blog_title

+html head

$path_info_da $path_info_mo $path_info_yr

+html head

-html story

-html story $title
-html story $body
-html story
-html story posted at: $ti | path: $path | permanent link to this entry -html story

+html story

$title

+html story

$body

+html story

posted at: $ti | path: $path | permanent link to this entry

+html story

-html date

$dw, $da $mo $yr

+html date

$dw, $da $mo $yr

html foot -html foot

-html foot

-html foot +html foot

+html foot

html foot html foot @@ -794,15 +791,17 @@ rss foot error content_type text/html +error head error head -error head -error head

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.

+error head Error: unknown Blosxom flavour "$flavour" +error head +error head

Error: unknown Blosxom flavour "$flavour"

+error head

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.

+error story

$title

+error story

$body

-error story

$title
-error story $body #

- -error date

$dw, $da $mo $yr

+error date

$dw, $da $mo $yr

error foot error foot diff --git a/t/permalinks/expected.bar b/t/permalinks/expected.bar index c39e86f..883aa85 100644 --- a/t/permalinks/expected.bar +++ b/t/permalinks/expected.bar @@ -1,31 +1,28 @@ Content-Type: text/html; charset=ISO-8859-1 + - - - My Weblog - + + + My Weblog - - My Weblog
- - -

Tue, 25 Jul 2006

- Lorem ipsum
- Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso +

My Weblog

Tue, 25 Jul 2006

Lorem ipsum

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.
-
- posted at: 11:02 | path: /foo | permanent link to this entry -

+amet ipso facto.Lorem ipsum dolor sit amet ipso facto.

posted at: 11:02 | path: /foo | permanent link to this entry

- +

diff --git a/t/permalinks/expected.html b/t/permalinks/expected.html index 3577238..5781a52 100644 --- a/t/permalinks/expected.html +++ b/t/permalinks/expected.html @@ -1,43 +1,39 @@ Content-Type: text/html; charset=ISO-8859-1 + - - - My Weblog - + + + My Weblog - - My Weblog
- - -

Tue, 25 Jul 2006

- Lorem ipso
- Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz +

My Weblog

Tue, 25 Jul 2006

Lorem ipso

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.
-
- posted at: 11:03 | path: /foo | permanent link to this entry -

- Lorem ipsum
- Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso +tyr wuz de ramas cora dola tym ipso hor.

posted at: 11:03 | path: /foo | permanent link to this entry

Lorem ipsum

+amet ipso facto.Lorem ipsum dolor sit amet ipso facto.

posted at: 11:02 | path: /foo | permanent link to this entry

- +

diff --git a/t/smoketest/expected.html b/t/smoketest/expected.html index 63a7e65..6766b36 100644 --- a/t/smoketest/expected.html +++ b/t/smoketest/expected.html @@ -1,22 +1,21 @@ Content-Type: text/html; charset=ISO-8859-1 + - - - My Weblog - + + + My Weblog - - My Weblog
- - -

Wed, 19 Jul 2006

- Lorem ipsum
- Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso +

My Weblog

Wed, 19 Jul 2006

Lorem ipsum

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.
-
- posted at: 22:54 | path: | permanent link to this entry -

+tyr wuz de ramas cora dola tym ipso hor.

posted at: 22:54 | path: | permanent link to this entry

- +

diff --git a/t/templates/data/head.html b/t/templates/data/head.html index 7426227..17c1753 100644 --- 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"> - - $blog_title $path_info_da $path_info_mo $path_info_yr - + + $blog_title $path_info_da $path_info_mo $path_info_yr

$blog_title

diff --git a/t/templates/expected.html b/t/templates/expected.html index b0714d8..c068b57 100644 --- 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"> - - My Weblog - + + My Weblog