Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

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

diff --git a/templates/archivepage.tmpl b/templates/archivepage.tmpl
index 7e8b8b8fc7aec12e99af2347f4bd24b3610bf8e8..28800e7632150329df26bc5e324b16a33a70d1ef 100644 (file)
--- a/templates/archivepage.tmpl
+++ b/templates/archivepage.tmpl
@@ -1,7 +1,19 @@
 <p>
 <p>

-<a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE ESCAPE=HTML></a><br />
+<TMPL_IF NAME="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>
 <i>
 Posted <TMPL_VAR CTIME>

+<TMPL_IF NAME="AUTHOR">
+by <span class="author">
+<TMPL_IF NAME="AUTHORURL">
+<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
+<TMPL_ELSE>
+<TMPL_VAR AUTHOR>
+</TMPL_IF>
+</span>
+</TMPL_IF>

 </i>
 </i>

-

 </p>
 </p>