php-blog-cvs

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

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

Modified Files:
      Tag: branch-smarty
	entries.tpl 
Log Message:
- Tweak $has_extended some more
- Rename $is_popup to $use_popups
- Use simpler Smarty logic


Index: entries.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/entries.tpl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- entries.tpl	10 Sep 2004 21:59:36 -0000	1.1.2.5
+++ entries.tpl	10 Sep 2004 22:20:26 -0000	1.1.2.6
@@ -39,7 +39,7 @@
             <div class="serendipity_entry_extended"><a id="extended"></a>{$bydate[date][x].extended}</div>
             {/if}
 
-            {if $bydate[date][x].has_extended}
+            {if $bydate[date][x].has_extended and not $is_single_entry}
             <br /><a href="{$bydate[date][x].entryLink}#extended">{$bydate[date][x].title|printf:VIEW_EXTENDED_ENTRY}</a><br /><br />
             {/if}
 
@@ -51,7 +51,7 @@
                 {$CONST.AT} <a href="{$bydate[date][x].entryLink}">{$bydate[date][x].timestamp|formatTime:'%H:%M'}</a>
 
                 {if $bydate[date][x].has_comments}
-                    {if $is_popup}
+                    {if $use_popups}
                         | <a href="{$serendipityHTTPPath}comment.php?serendipity[entry_id]={$bydate[date][x].id}&amp;serendipity[type]=comments" onclick="window.open(this.href, \'comments\', \'width=480,height=480,scrollbars=yes\'); return false;">{$bydate[date][x].label_comments} ({$bydate[date][x].comments})</a>
                     {else}
                         | <a href="{$bydate[date][x].entryLink}#comments">{$bydate[date][x].label_trackbacks} ({$bydate[date][x].comments})</a>
@@ -59,7 +59,7 @@
                 {/if}
 
                 {if $bydate[date][x].has_trackbacks}
-                    {if $is_popup}
+                    {if $use_popups}
                         | <a href="{$serendipityHTTPPath}comment.php?serendipity[entry_id]={$bydate[date][x].id}&amp;serendipity[type]=trackbacks" onclick="window.open(this.href, \'comments\', \'width=480,height=480,scrollbars=yes\'); return false;">{$bydate[date][x].label_trackbacks} ({$bydate[date][x].trackbacks})</a>
                     {else}
                         | <a href="{$bydate[date][x].entryLink}#trackbacks">{$bydate[date][x].label_trackbacks} ({$bydate[date][x].trackbacks})</a>
@@ -106,7 +106,7 @@
             <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_COMMENT_APPROVED|printf:COMMENT_APPROVED}</div><br />
         {/if}
 
-        {if $is_single_entry and $is_popup != true}
+        {if $is_single_entry and not $use_popups}
             <div class="serendipity_comments">
                 <br />
                 <a id="trackbacks"></a>