Merge commit 'upstream/master' into prv/po

[ikiwiki.git] / templates / page.tmpl

diff --git a/templates/page.tmpl b/templates/page.tmpl
index ea50fb722570c9a7fff7855a48ba7ba476802ef8..f75491127bfd33a921c97bbc1177f48d11874282 100644 (file)
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -49,9 +49,13 @@
 <TMPL_IF NAME="PREFSURL">
 <li><a href="<TMPL_VAR PREFSURL>">Preferences</a></li>
 </TMPL_IF>
+<TMPL_IF NAME="COMMENTSLINK">
+<li><TMPL_VAR COMMENTSLINK><br /></li>
+<TMPL_ELSE>
 <TMPL_IF NAME="DISCUSSIONLINK">
 <li><TMPL_VAR DISCUSSIONLINK><br /></li>
 </TMPL_IF>
+</TMPL_IF>
 </ul>
 </div>
 </TMPL_IF>
@@ -70,16 +74,13 @@
 <TMPL_IF COMMENTS>
 <div id="comments">
 <TMPL_VAR COMMENTS>
+<TMPL_IF ADDCOMMENTURL>
+<div class="addcomment">
+<a href="<TMPL_VAR ADDCOMMENTURL>">Add a comment</a>
 </div>
-
-<TMPL_UNLESS COMMENTURL>
+<TMPL_ELSE>
 <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>