diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-07-20 23:09:23 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-20 23:18:03 +0200 |
| commit | f56c8b570fe10018c5842c27f30fcade6b5a87af (patch) | |
| tree | b8d2be3cd474296071c958884099f4378b096db2 /atompage.tmpl | |
| parent | 3011422a7d372db57061a803e4d14029fef477d8 (diff) | |
| parent | ee62a82c4be0125da6b4758e43e231a3c28c857f (diff) | |
Merge branch 'master-da' into wian-da
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 5be669e..631ef6d 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="da"> - <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="da"> +<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> |