php-blog-cvs

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

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

Modified Files:
	entries.tpl 
Log Message:
- Move link generation from templates into core

TODO: A few more are still missing


Index: entries.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/entries.tpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- entries.tpl	9 Dec 2004 20:11:25 -0000	1.7
+++ entries.tpl	18 Dec 2004 23:20:20 -0000	1.8
@@ -49,7 +49,7 @@
 
                 {if $entry.has_comments}
                     {if $use_popups}
-                        | <a href="{$serendipityHTTPPath}comment.php?serendipity[entry_id]={$entry.id}&amp;serendipity[type]=comments" onclick="window.open(this.href, 'comments', 'width=480,height=480,scrollbars=yes'); return false;">{$entry.label_comments} ({$entry.comments})</a>
+                        | <a href="{$entry.link_popup_comments}" onclick="window.open(this.href, 'comments', 'width=480,height=480,scrollbars=yes'); return false;">{$entry.label_comments} ({$entry.comments})</a>
                     {else}
                         | <a href="{$entry.link}#comments">{$entry.label_comments} ({$entry.comments})</a>
                     {/if}
@@ -57,14 +57,14 @@
 
                 {if $entry.has_trackbacks}
                     {if $use_popups}
-                        | <a href="{$serendipityHTTPPath}comment.php?serendipity[entry_id]={$entry.id}&amp;serendipity[type]=trackbacks" onclick="window.open(this.href, 'comments', 'width=480,height=480,scrollbars=yes'); return false;">{$entry.label_trackbacks} ({$entry.trackbacks})</a>
+                        | <a href="{$entry.link_popup_trackbacks}" onclick="window.open(this.href, 'comments', 'width=480,height=480,scrollbars=yes'); return false;">{$entry.label_trackbacks} ({$entry.trackbacks})</a>
                     {else}
                         | <a href="{$entry.link}#trackbacks">{$entry.label_trackbacks} ({$entry.trackbacks})</a>
                     {/if}
                 {/if}
 
                 {if $entry.is_entry_owner and not $is_preview}
-                        | <a href="{$serendipityBaseURL}serendipity_admin.php?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=edit&amp;serendipity[id]={$entry.id}">{$CONST.EDIT_ENTRY}</a>
+                        | <a href="{$entry.link_edit}">{$CONST.EDIT_ENTRY}</a>
                 {/if}
 
                 {$entry.add_footer}
@@ -75,8 +75,8 @@
                  xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/"
                  xmlns:dc="http://purl.org/dc/elements/1.1/">
         <rdf:Description
-                 rdf:about="{$serendipityBaseURL}{$serendipityRewritePrefix}feeds/ei_{$entry.id}.rdf"
-                 trackback:ping="{$serendipityBaseURL}comment.php?type=trackback&amp;entry_id={$entry.id}"
+                 rdf:about="{$entry.link_rdf}"
+                 trackback:ping="{$entry.link_trackback}"
                  dc:title="{$entry.title}"
                  dc:identifier="{$entry.rdf_ident}" />
         </rdf:RDF>
@@ -109,7 +109,7 @@
                 <a id="trackbacks"></a>
                 <div class="serendipity_commentsTitle">{$CONST.TRACKBACKS}</div>
                     <div class="serendipity_center">
-                        <a style="font-weight: normal" href="{$serendipityBaseURL}comment.php?type=trackback&amp;entry_id={$entry_id}" onclick="alert('{$CONST.TRACKBACK_SPECIFIC_ON_CLICK|@escape:htmlall}'); return false;" title="{$CONST.TRACKBACK_SPECIFIC_ON_CLICK|@escape}">{$CONST.TRACKBACK_SPECIFIC}</a>
+                        <a style="font-weight: normal" href="{$entry.link_trackback}" onclick="alert('{$CONST.TRACKBACK_SPECIFIC_ON_CLICK|@escape:htmlall}'); return false;" title="{$CONST.TRACKBACK_SPECIFIC_ON_CLICK|@escape}">{$CONST.TRACKBACK_SPECIFIC}</a>
                     </div>
                     <br />
                         {serendipity_printTrackbacks entry=$entry.id}
@@ -123,9 +123,9 @@
                 <div class="serendipity_commentsTitle">{$CONST.COMMENTS}</div>
                 <div class="serendipity_center">{$CONST.DISPLAY_COMMENTS_AS}
                 {if $entry.viewmode eq $CONST.VIEWMODE_LINEAR}
-                    ({$CONST.COMMENTS_VIEWMODE_LINEAR} | <a href="{$serendipityHTTPPath}{$serendipityIndexFile}?url={$entry.commURL}&amp;serendipity[cview]={$CONST.VIEWMODE_THREADED}#comments">{$CONST.COMMENTS_VIEWMODE_THREADED}</a>)
+                    ({$CONST.COMMENTS_VIEWMODE_LINEAR} | <a href="{$entry.link_viewmode_threaded}#comments">{$CONST.COMMENTS_VIEWMODE_THREADED}</a>)
                 {else}
-                    (<a href="{$serendipityHTTPPath}{$serendipityIndexFile}?url={$entry.commURL}&amp;serendipity[cview]={$CONST.VIEWMODE_LINEAR}#comments">{$CONST.COMMENTS_VIEWMODE_LINEAR}</a> | {$CONST.COMMENTS_VIEWMODE_THREADED})
+                    (<a href="{$entry.link_viewmode_linear}#comments">{$CONST.COMMENTS_VIEWMODE_LINEAR}</a> | {$CONST.COMMENTS_VIEWMODE_THREADED})
                 {/if}
                 </div>
                 <br />