Merge branch 'master' into comments

[ikiwiki.git] / templates / page.tmpl

diff --git a/templates/page.tmpl b/templates/page.tmpl
index 8c2ca668f0d2eaa9d07d9ada435ee1cdc7d9d650..ea50fb722570c9a7fff7855a48ba7ba476802ef8 100644 (file)
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -67,6 +67,22 @@
 <TMPL_VAR CONTENT>
 </div>
 
+<TMPL_IF COMMENTS>
+<div id="comments">
+<TMPL_VAR COMMENTS>
+</div>
+
+<TMPL_UNLESS COMMENTURL>
+<div class="addcomment">Comments on this page are closed.</div>
+</TMPL_UNLESS>
+</TMPL_IF>
+
+<TMPL_IF COMMENTURL>
+<div class="addcomment">
+<a href="<TMPL_VAR COMMENTURL>">Add a comment</a>
+</div>
+</TMPL_IF>
+
 <div id="footer" class="pagefooter">
 <div id="pageinfo">