diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-01-20 20:43:20 +0100 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-01-20 20:43:20 +0100 |
| commit | 6137005a40de0efbae16f4b5e810bb6af3abe59e (patch) | |
| tree | b335e36904c028c143504840384175d7fa0ddce8 | |
| parent | 282ce91522affa27606bc5b835d8a7d7a91b4df5 (diff) | |
Sync with upstream commit 405e8a703126cc5de426063dedbd2394b747782a (Wed Jan 9, release 2.20).
| -rw-r--r-- | aggregatepost.tmpl | 3 | ||||
| -rw-r--r-- | atomitem.tmpl | 43 | ||||
| -rw-r--r-- | atompage.tmpl | 26 | ||||
| -rw-r--r-- | misc.tmpl | 2 | ||||
| -rw-r--r-- | page.tmpl | 2 | ||||
| -rw-r--r-- | recentchanges.tmpl | 2 |
6 files changed, 62 insertions, 16 deletions
diff --git a/aggregatepost.tmpl b/aggregatepost.tmpl index 5b0f2f4..739a576 100644 --- a/aggregatepost.tmpl +++ b/aggregatepost.tmpl @@ -8,5 +8,8 @@ <TMPL_IF NAME="PERMALINK"> [[meta permalink="<TMPL_VAR NAME="PERMALINK" ESCAPE=HTML>"]] </TMPL_IF> +<TMPL_IF NAME="COPYRIGHT"> +[[meta copyright="<TMPL_VAR NAME="COPYRIGHT" ESCAPE=HTML>"]] +</TMPL_IF> [[meta author="<TMPL_VAR NAME="NAME" ESCAPE=HTML>"]] [[meta authorurl="<TMPL_VAR NAME="URL" ESCAPE=HTML>"]] diff --git a/atomitem.tmpl b/atomitem.tmpl index 4dc2d07..1b1d686 100644 --- a/atomitem.tmpl +++ b/atomitem.tmpl @@ -1,25 +1,44 @@ <entry> <title><TMPL_VAR TITLE></title> + <id><TMPL_VAR URL></id> + <link href="<TMPL_VAR PERMALINK>"/> <TMPL_IF NAME="AUTHOR"> - <author><TMPL_VAR AUTHOR ESCAPE=HTML></author> + <author><name><TMPL_VAR AUTHOR ESCAPE=HTML></name></author> + </TMPL_IF> + <TMPL_IF NAME="COPYRIGHT"> + <rights type="xhtml" xml:lang="en"> + <div xmlns="http://www.w3.org/1999/xhtml"> + <TMPL_IF NAME="LICENSE"> + <TMPL_VAR LICENSE> + <TMPL_VAR COPYRIGHT> + <TMPL_ELSE> + <TMPL_VAR COPYRIGHT> + </TMPL_IF> + </div> + </rights> <TMPL_ELSE> + <TMPL_IF NAME="LICENSE"> + <rights type="xhtml" xml:lang="en"> + <div xmlns="http://www.w3.org/1999/xhtml"> + <TMPL_VAR LICENSE> + </div> + </rights> + </TMPL_IF> </TMPL_IF> - <id><TMPL_VAR URL></id> - <link href="<TMPL_VAR PERMALINK>"/> <TMPL_IF NAME="CATEGORIES"> - <TMPL_LOOP NAME="CATEGORIES"> - <category term="<TMPL_VAR CATEGORY>" /> - </TMPL_LOOP> + <TMPL_LOOP NAME="CATEGORIES"> + <category term="<TMPL_VAR CATEGORY>" /> + </TMPL_LOOP> </TMPL_IF> <updated><TMPL_VAR MDATE_3339></updated> <published><TMPL_VAR CDATE_3339></published> <TMPL_IF NAME="ENCLOSURE"> - <link rel="enclosure" type="<TMPL_VAR TYPE>" href="<TMPL_VAR ENCLOSURE>" length="<TMPL_VAR LENGTH>" /> + <link rel="enclosure" type="<TMPL_VAR TYPE>" href="<TMPL_VAR ENCLOSURE>" length="<TMPL_VAR LENGTH>" /> <TMPL_ELSE> - <content type="xhtml" xml:lang="en"> - <div xmlns="http://www.w3.org/1999/xhtml"> - <TMPL_VAR CONTENT> - </div> - </content> + <content type="xhtml" xml:lang="en"> + <div xmlns="http://www.w3.org/1999/xhtml"> + <TMPL_VAR CONTENT> + </div> + </content> </TMPL_IF> </entry> diff --git a/atompage.tmpl b/atompage.tmpl index 1bca3e7..acc4737 100644 --- a/atompage.tmpl +++ b/atompage.tmpl @@ -5,8 +5,32 @@ <link href="<TMPL_VAR PAGEURL>"/> <link href="<TMPL_VAR FEEDURL>" rel="self"/> <author> -<name><TMPL_VAR WIKINAME></name> +<TMPL_IF NAME="AUTHOR"> + <name><TMPL_VAR AUTHOR></name> +<TMPL_ELSE> + <name><TMPL_VAR WIKINAME></name> +</TMPL_IF> </author> +<TMPL_IF NAME="COPYRIGHT"> + <rights type="xhtml" xml:lang="en"> + <div xmlns="http://www.w3.org/1999/xhtml"> + <TMPL_IF NAME="LICENSE"> + <TMPL_VAR LICENSE> + <TMPL_VAR COPYRIGHT> + <TMPL_ELSE> + <TMPL_VAR COPYRIGHT> + </TMPL_IF> + </div> + </rights> +<TMPL_ELSE> + <TMPL_IF NAME="LICENSE"> + <rights type="xhtml" xml:lang="en"> + <div xmlns="http://www.w3.org/1999/xhtml"> + <TMPL_VAR LICENSE> + </div> + </rights> + </TMPL_IF> +</TMPL_IF> <id><TMPL_VAR PAGEURL></id> <subtitle type="html"><TMPL_VAR FEEDDESC ESCAPE=HTML></subtitle> <generator uri="http://ikiwiki.info/" version="<TMPL_VAR VERSION>">ikiwiki</generator> @@ -1,6 +1,6 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> <base href="<TMPL_VAR BASEURL>" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> @@ -1,6 +1,6 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title><TMPL_VAR TITLE></title> diff --git a/recentchanges.tmpl b/recentchanges.tmpl index e954503..e03482f 100644 --- a/recentchanges.tmpl +++ b/recentchanges.tmpl @@ -1,6 +1,6 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> <base href="<TMPL_VAR BASEURL>" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |