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 /atompage.tmpl | |
parent | 282ce91522affa27606bc5b835d8a7d7a91b4df5 (diff) |
Sync with upstream commit 405e8a703126cc5de426063dedbd2394b747782a (Wed Jan 9, release 2.20).
Diffstat (limited to 'atompage.tmpl')
-rw-r--r-- | atompage.tmpl | 26 |
1 files changed, 25 insertions, 1 deletions
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> |