[php-blog-cvs] serendipity/templates/default entries.tpl,1.1.2.13,1.1.2.14

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24698/templates/default

Modified Files:
      Tag: branch-smarty
	entries.tpl 
Log Message:
- Move the ability to toggle comments out of _printComments and into the templates, where it belongs


Index: entries.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/entries.tpl,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -d -r1.1.2.13 -r1.1.2.14
--- entries.tpl	27 Sep 2004 12:13:51 -0000	1.1.2.13
+++ entries.tpl	5 Oct 2004 19:40:40 -0000	1.1.2.14
@@ -115,14 +115,22 @@
                 <a id="comments"></a>
                 <div class="serendipity_commentsTitle">{$CONST.COMMENTS}</div>
                 <div class="serendipity_center">{$CONST.DISPLAY_COMMENTS_AS}
-            {if $is_cview_linear}
+                {if $is_cview_linear}
                     ({$CONST.COMMENTS_VIEWMODE_LINEAR} | <a href="{$serendipityHTTPPath}{$serendipityIndexFile}?url={$entry.commURL}&amp;serendipity[cview]={$CONST.VIEWMODE_THREADED}#comments">{$CONST.COMMENTS_VIEWMODE_THREADED}</a>)
-            {else}
+                {else}
                     (<a href="{$serendipityHTTPPath}{$serendipityIndexFile}?url={$entry.commURL}&amp;serendipity[cview]={$CONST.VIEWMODE_LINEAR}#comments">{$CONST.COMMENTS_VIEWMODE_LINEAR}</a> | {$CONST.COMMENTS_VIEWMODE_THREADED})
-            {/if}
+                {/if}
                 </div>
+
                 {$COMMENTS}
 
+                {if $entry.is_entry_owner}
+                    {if $entry.allow_comments}
+                    <div class="serendipity_center">(<a href="{$entry.link_deny_comments}">{$CONST.COMMENTS_DISABLE}</a>)</div>
+                    {else}
+                    <div class="serendipity_center">(<a href="{$entry.link_allow_comments}">{$CONST.COMMENTS_ENABLE}</a>)</div>
+                    {/if}
+                {/if}
                 <a id="feedback"></a>
 
                 {section name=message loop=$comments_messagestack}
@@ -139,7 +147,7 @@
                 <br />
                 <div class="serendipity_center serendipity_msg_notice">{$CONST.COMMENT_ADDED}<br />{$CONST.THIS_COMMENT_NEEDS_REVIEW}</div>
 
-                {elseif $is_comment_closed}
+                {elseif not $entry.allow_comments}
 
                 <br />
                 <div class="serendipity_center serendipity_msg_important">{$CONST.COMMENTS_CLOSED}</div>