From cd7ac8f72a43a53aeca3b5e8daf906e990420016 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 17 Dec 2008 19:38:02 -0500
Subject: add Comments link when displaying a page inline

This link will supplant the usual Discussion link for pages
that have comments enabled.
---
 templates/inlinepage.tmpl | 4 ++++
 templates/page.tmpl       | 6 ++----
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'templates')

diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl
index 984d33cef..3c0b93315 100644
--- a/templates/inlinepage.tmpl
+++ b/templates/inlinepage.tmpl
@@ -58,9 +58,13 @@ License: <TMPL_VAR LICENSE>
 <TMPL_IF NAME="EDITURL">
 <li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
 </TMPL_IF>
+<TMPL_IF NAME="COMMENTSLINK">
+<li><TMPL_VAR COMMENTSLINK></li>
+<TMPL_ELSE>
 <TMPL_IF NAME="DISCUSSIONLINK">
 <li><TMPL_VAR DISCUSSIONLINK></li>
 </TMPL_IF>
+</TMPL_IF>
 </ul>
 </div><!--.actions-->
 </TMPL_IF>
diff --git a/templates/page.tmpl b/templates/page.tmpl
index ea50fb722..79c2b8b6e 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -70,18 +70,16 @@
 <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>
+</TMPL_IF>
 
 <div id="footer" class="pagefooter">
 <div id="pageinfo">
-- 
cgit v1.2.3