--- wikisrc/templates/page.tmpl	2010/07/04 04:53:41	1.12
+++ wikisrc/templates/page.tmpl	2011/10/22 05:38:36	1.13
@@ -54,6 +54,9 @@
 		      <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_IF>
 		      <TMPL_IF NAME="GETSOURCEURL">
 			<li><a href="<TMPL_VAR GETSOURCEURL>">Source</a></li>
 		      </TMPL_IF>
@@ -95,16 +98,9 @@
 </div>
 
 <TMPL_UNLESS DYNAMIC>
-<TMPL_IF DISCUSSIONLINK>
-<div id="comments">
-<TMPL_IF NAME="COMMENTEDITURL">
-<h3><a href="<TMPL_VAR COMMENTEDITURL>" rel="nofollow">Discussion</a></h3>
-</TMPL_IF>
 <TMPL_IF COMMENTS>
+<div id="comments">
 <TMPL_VAR COMMENTS>
-<TMPL_ELSE>
-<p>If there were some discussion, you'd be reading it right here. How about
-you go first?</p>
 <TMPL_IF ADDCOMMENTURL>
 <div class="addcomment">
 <a href="<TMPL_VAR ADDCOMMENTURL>">Add a comment</a>
@@ -114,7 +110,6 @@ you go first?</p>
 </TMPL_IF>
 </div>
 </TMPL_IF>
-</TMPL_IF>
 </TMPL_UNLESS>
 
 		      </TMPL_IF>
@@ -122,11 +117,6 @@ you go first?</p>
 <div id="footer" class="pagefooter">
 <TMPL_UNLESS DYNAMIC>
 <div id="pageinfo">
-
-		      <TMPL_IF NAME="COMMENTSLINK">
-			<li><TMPL_VAR COMMENTSLINK><br /></li>
-			    </TMPL_IF>
-
 <TMPL_IF NAME="TAGS">
 <div class="tags">
 Tags: