Merge remote branch 'upstream/master' into prv/po

[ikiwiki.git] / templates / archivepage.tmpl

diff --git a/templates/archivepage.tmpl b/templates/archivepage.tmpl
index 6bc789dfb29cfe241055ac51c4c392df6a6a50a4..93bdd9ce0e50135eec16dd4b7b6a9c5c5969a190 100644 (file)
--- a/templates/archivepage.tmpl
+++ b/templates/archivepage.tmpl
@@ -1,7 +1,19 @@
 <p>
+<TMPL_IF PERMALINK>
+<a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a><br />
+<TMPL_ELSE>
 <a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a><br />
+</TMPL_IF>
 <i>
 Posted <TMPL_VAR CTIME>
+<TMPL_IF AUTHOR>
+by <span class="author">
+<TMPL_IF AUTHORURL>
+<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
+<TMPL_ELSE>
+<TMPL_VAR AUTHOR>
+</TMPL_IF>
+</span>
+</TMPL_IF>
 </i>
-
 </p>