diff options
author | Jonas Smedegaard <dr@jones.dk> | 2010-07-20 22:22:54 +0200 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-20 22:22:54 +0200 |
commit | 3e2f923e92cf5757631a0ed28223a68d38e71f6f (patch) | |
tree | 723c12c504f7735eb8c364b5efd2e91e011dbee4 /atompage.tmpl | |
parent | b3ee98e93598c5805c2eb75a44a0cba13e2b77b7 (diff) | |
parent | 5df058b2b3dc6e565ad3b3604263f487ef65f2af (diff) |
Merge branch 'master' into scs
Conflicts (manually resolved):
misc.tmpl
page.tmpl
Diffstat (limited to 'atompage.tmpl')
-rw-r--r-- | atompage.tmpl | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/atompage.tmpl b/atompage.tmpl index dcb89ab..e82b598 100644 --- a/atompage.tmpl +++ b/atompage.tmpl @@ -5,32 +5,32 @@ <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="html" xml:lang="en"> - <TMPL_IF NAME="LICENSE"> - <TMPL_VAR LICENSE> - <TMPL_VAR COPYRIGHT ESCAPE=HTML> - <TMPL_ELSE> - <TMPL_VAR COPYRIGHT ESCAPE=HTML> - </TMPL_IF> - </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="html"> - <TMPL_VAR LICENSE ESCAPE=HTML> - </rights> - </TMPL_IF> + <TMPL_VAR COPYRIGHT ESCAPE=HTML> </TMPL_IF> -<TMPL_IF NAME="GUID"> - <id><TMPL_VAR GUID></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> |