php-blog-cvs

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

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

Modified Files:
	entries.tpl 
Log Message:
- Separate categories by a ", "
- Put link generation for each category into the core
- Don't use {section}
- comments_messagestack must always be an array!


Index: entries.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/entries.tpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- entries.tpl	26 Dec 2004 20:43:49 -0000	1.10
+++ entries.tpl	30 Dec 2004 22:41:29 -0000	1.11
@@ -17,7 +17,7 @@
             <span class="serendipity_entryIcon">
             {foreach from=$entry.categories item="category"}
                 {if $category.category_icon}
-                    <a href="{$serendipityHTTPPath}{$serendipityRewritePrefix}{$CONST.PATH_CATEGORIES}/{$category.categoryid}-{$category.category_name|@makeFilename}"><img class="serendipity_entryIcon" title="{$category.category_name|@escape}{$category.category_description|@emptyPrefix}" alt="{$category.category_name|@escape}" src="{$category.category_icon}" /></a>
+                    <a href="{$category.category_link}"><img class="serendipity_entryIcon" title="{$category.category_name|@escape}{$category.category_description|@emptyPrefix}" alt="{$category.category_name|@escape}" src="{$category.category_icon}" /></a>
                 {/if}
             {/foreach}
             </span>
@@ -37,8 +37,8 @@
 
             <div class='serendipity_entryFooter'>
                 {$CONST.POSTED_BY} <a href="{$entry.link_username}">{$entry.username}</a>
-                {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 $entry.categories}
+                   {$CONST.IN} {foreach from=$entry.categories item="category" name="categories"}<a href="{$category.category_link}">{$category.category_name|@escape}</a>{if not $smarty.foreach.categories.last}, {/if}{/foreach}
                 {/if}
 
                 {if $dategroup.is_sticky}
@@ -140,9 +140,9 @@
                 {/if}
                 <a id="feedback"></a>
 
-                {section name=message loop=$comments_messagestack}
-                <div class="serendipity_center serendipity_msg_important">{$comments_messagestack[message]}</div>
-                {/section}
+                {foreach from=$comments_messagestack item="message"}
+                <div class="serendipity_center serendipity_msg_important">{$message}</div>
+                {/foreach}
 
                 {if $is_comment_added}