[php-blog-cvs] serendipity/templates/default entries.tpl,1.1.2.17,1.1.2.18 smarty_layout.php,1.1.2.4,1.1.2.5

[Garvin H. <gar...@us...>]

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

Modified Files:
      Tag: branch-smarty
	entries.tpl smarty_layout.php 
Log Message:
* renamed files as announced on the list. upgrader will take care of moving
  old files to a 'backup' directory for upgrading (non-CVS) users.
* MFH'ed some parts
* Fixed quicksave button display
* Fixed footer
* Fixed entry preview properly
* Fixed printing categories where no categories appeard in entry view



Index: entries.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/entries.tpl,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -d -r1.1.2.17 -r1.1.2.18
--- entries.tpl	9 Oct 2004 23:26:16 -0000	1.1.2.17
+++ entries.tpl	6 Nov 2004 11:22:50 -0000	1.1.2.18
@@ -29,13 +29,13 @@
             <div class="serendipity_entry_extended"><a id="extended"></a>{$entry.extended}</div>
             {/if}
 
-            {if $entry.has_extended and not $is_single_entry}
+            {if $entry.has_extended and not $is_single_entry and not $entry.is_extended}
             <br /><a href="{$entry.link}#extended">{$CONST.VIEW_EXTENDED_ENTRY|@sprintf:$entry.title}</a><br /><br />
             {/if}
 
             <div class='serendipity_entryFooter'>
                 {$CONST.POSTED_BY} {$entry.username}
-                {if $entry.categories}
+                {if $entry.categories and count($entry.categories) > 0}
                    {$CONST.IN} {foreach from=$entry.categories item="category"}<a href="{$serendipityHTTPPath}{$serendipityRewritePrefix}{$CONST.PATH_CATEGORIES}/{$category.categoryid}-{$category.category_name|@makeFilename}">{$category.category_name|@escape}</a> {/foreach}
                 {/if}
                 {$CONST.AT} <a href="{$entry.link}">{$entry.timestamp|@formatTime:'%H:%M'}</a>

Index: smarty_layout.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/smarty_layout.php,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- smarty_layout.php	16 Oct 2004 17:27:15 -0000	1.1.2.4
+++ smarty_layout.php	6 Nov 2004 11:22:50 -0000	1.1.2.5
@@ -1,8 +1,8 @@
 <?php # $Id$
 
 include_once('serendipity_config.inc.php');
-include_once(S9Y_INCLUDE_PATH . 'serendipity_plugin_api.php');
-include_once(S9Y_INCLUDE_PATH . 'serendipity_sidebar_items.php');
+include_once(S9Y_INCLUDE_PATH . 'include/plugin_api.inc.php');
+include_once(S9Y_INCLUDE_PATH . 'include/plugin_internal.inc.php');
 
 switch ($serendipity['GET']['action']) {
     // User wants to read the diary