X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/2bd8ada5a619a1c32bf19f44e4f96e083ceb17b8..1ef40ff68370aba85e9816221675a8edd7a308f5:/templates/atompage.tmpl?ds=sidebyside diff --git a/templates/atompage.tmpl b/templates/atompage.tmpl index 9ec7df435..3cdd71d1a 100644 --- a/templates/atompage.tmpl +++ b/templates/atompage.tmpl @@ -5,39 +5,35 @@ <link href="<TMPL_VAR PAGEURL>"/> <link href="<TMPL_VAR FEEDURL>" rel="self" type="application/atom+xml"/> <author> -<TMPL_IF NAME="AUTHOR"> - <name><TMPL_VAR AUTHOR></name> +<TMPL_IF AUTHOR> +<name><TMPL_VAR AUTHOR></name> <TMPL_ELSE> - <name><TMPL_VAR WIKINAME></name> +<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_IF COPYRIGHT> +<rights type="html" xml:lang="en"> +<TMPL_IF LICENSE> + <TMPL_VAR LICENSE> + <TMPL_VAR COPYRIGHT ESCAPE=HTML> <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_VAR COPYRIGHT ESCAPE=HTML> </TMPL_IF> -<TMPL_IF NAME="ATOMID"> - <id><TMPL_VAR ATOMID></id> +</rights> <TMPL_ELSE> - <id><TMPL_VAR PAGEURL></id> +<TMPL_IF LICENSE> +<rights type="html"> + <TMPL_VAR LICENSE ESCAPE=HTML> +</rights> +</TMPL_IF> +</TMPL_IF> +<TMPL_IF GUID> +<id><TMPL_VAR GUID></id> +<TMPL_ELSE> +<id><TMPL_VAR PAGEURL></id> </TMPL_IF> <subtitle type="html"><TMPL_VAR FEEDDESC ESCAPE=HTML></subtitle> -<generator uri="http://ikiwiki.info/" version="<TMPL_VAR VERSION>">ikiwiki</generator> +<generator uri="http://ikiwiki.info/">ikiwiki</generator> <updated><TMPL_VAR FEEDDATE></updated> <TMPL_VAR CONTENT> </feed>