Merge branch 'master' into cvs

[git.ikiwiki.info.git] / templates / aggregatepost.tmpl

diff --git a/templates/aggregatepost.tmpl b/templates/aggregatepost.tmpl
index 4dfedf53da00e47cb63ee0ca96bb45d536b7fbda..4e89efe3282082faf98f654294a31357422ff34b 100644 (file)
--- a/templates/aggregatepost.tmpl
+++ b/templates/aggregatepost.tmpl
@@ -1,13 +1,15 @@
 <TMPL_VAR CONTENT>
-<hr>
-<p>
-<i>
-From <a href="<TMPL_VAR URL>"><TMPL_VAR NAME></a>
-<TMPL_IF NAME="LINK">
-; <a href="<TMPL_VAR LINK>">permalink</a>
-</TMPL_IF>
-</i>
-</p>
-<TMPL_LOOP NAME="TAGS">
-[[<TMPL_VAR TAG>]]
+<TMPL_LOOP TAGS>
+[[!tag <TMPL_VAR TAG>]]
 </TMPL_LOOP>
+<TMPL_IF TITLE>
+[[!meta title="<TMPL_VAR TITLE ESCAPE=HTML>"]]
+</TMPL_IF>
+<TMPL_IF PERMALINK>
+[[!meta permalink="<TMPL_VAR PERMALINK ESCAPE=HTML>"]]
+</TMPL_IF>
+<TMPL_IF COPYRIGHT>
+[[!meta copyright="<TMPL_VAR COPYRIGHT ESCAPE=HTML>"]]
+</TMPL_IF>
+[[!meta author="<TMPL_VAR NAME ESCAPE=HTML>"]]
+[[!meta authorurl="<TMPL_VAR URL ESCAPE=HTML>"]]