Menu
▾
▴
Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[28325] trunk/templates
|
From: Gary Cunningham-L. <ga...@cu...> - 2010-08-06 16:45:13
|
Hi, If Jean-Marc doesn't get to this first, I'll update the files. I was keeping them in sync with your changes, but missed some commits, as it turns out. I forgot to check again before the files were committed. -- Gary Rodrigo Sampaio Primo wrote: > Hi Jean-Marc, > > Thanks for implementing the blog template wrappers. > > Unfortunately I think that you used an outdated version of the blog > templates. So this commit reverted some of my changes to the blog > interface. > > I saw that the code for trackbacks that has been removed is back and > also the button to add and view the comments (we decided that in the > blog the comments and the form to add a new one should be always > visible). Maybe there is more, we would need to check. > > I think that the best way to avoid problems is doing this commit again > but this time with the last version of the blog templates. Can you do > that? > > Cheers, Rodrigo. > > On Thu, Aug 5, 2010 at 4:03 PM, <Jy...@us... > <mailto:Jy...@us...>> wrote: > > Revision: 28325 > > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=28325&view=rev > <http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=28325&view=rev> > Author: Jyhem > Date: 2010-08-05 20:03:52 +0000 (Thu, 05 Aug 2010) > > Log Message: > ----------- > [NEW] Import Chibaguy's blog template wrappers for more > flexibility in blog layout as discussed in TikiFest Barcelona2 > > Modified Paths: > -------------- > trunk/templates/blog-heading.tpl > trunk/templates/tiki-view_blog.tpl > trunk/templates/tiki-view_blog_post.tpl > > Added Paths: > ----------- > trunk/templates/blog-post-heading.tpl > trunk/templates/blog_actions.tpl > trunk/templates/blog_author_info.tpl > trunk/templates/blog_footer.tpl > trunk/templates/blog_post_actions.tpl > trunk/templates/blog_post_author_info.tpl > trunk/templates/blog_post_footer.tpl > trunk/templates/blog_post_postbody_content.tpl > trunk/templates/blog_post_postbody_title.tpl > trunk/templates/blog_postbody_title.tpl > trunk/templates/blog_wrapper.tpl > > Modified: trunk/templates/blog-heading.tpl > =================================================================== > --- trunk/templates/blog-heading.tpl 2010-08-05 19:57:59 UTC > (rev 28324) > +++ trunk/templates/blog-heading.tpl 2010-08-05 20:03:52 UTC > (rev 28325) > @@ -1,4 +1,5 @@ > -<h1>{$title|escape}</h1> > +{title help='Blogs'}{$title|escape}{/title} > +<div class="breadcrumbs"><a class="link" > href="tiki-list_blogs.php">{tr}Blogs{/tr}</a> > {$prefs.site_crumb_seper} {$title|escape}</div> > {if $description neq ""} > <div class="description">{$description|escape}</div> > {/if} > @@ -10,4 +11,4 @@ > > ({$posts} {tr}Posts{/tr} | {$hits} {tr}Visits{/tr} | > {tr}Activity={/tr}{$activity|string_format:"%.2f"}) > </div> > -*} > \ No newline at end of file > +*} > > Added: trunk/templates/blog-post-heading.tpl > =================================================================== > --- trunk/templates/blog-post-heading.tpl > (rev 0) > +++ trunk/templates/blog-post-heading.tpl 2010-08-05 > 20:03:52 UTC (rev 28325) > @@ -0,0 +1,9 @@ > +{title help='Blogs' > url="tiki-view_blog.php?blogId=$blogId"}{$blog_data.title|escape}{/title} > +<div class="breadcrumbs"><a class="link" > href="tiki-list_blogs.php">{tr}Blogs{/tr}</a> > {$prefs.site_crumb_seper} <a class="link" > href="tiki-view_blog.php?blogId={$post_info.blogId}">{$blog_data.title|escape}</a> > {$prefs.site_crumb_seper} {$post_info.title|escape}</div> > +{* example code to add more info to the default blog heading if > desired > + * remove the line above (starting curly bracket then asterisk) > and the last line to enable > +<div class="bloginfo"> > +{tr}Created by{/tr} {$post_info.user|userlink} {tr}on{/tr} > {$post_info.created|tiki_short_datetime}<br /> > +{tr}Last post{/tr} {$post_info.lastModif|tiki_short_datetime}<br /> > +</div> > +*} > > > Property changes on: trunk/templates/blog-post-heading.tpl > ___________________________________________________________________ > Added: svn:keywords > + Id > > Added: trunk/templates/blog_actions.tpl > =================================================================== > --- trunk/templates/blog_actions.tpl > (rev 0) > +++ trunk/templates/blog_actions.tpl 2010-08-05 20:03:52 UTC > (rev 28325) > @@ -0,0 +1,9 @@ > +{* $Id$ *} > +<div class="actions"> > + {if ($ownsblog eq 'y') or ($user and $listpages[ix].user > eq $user) or $tiki_p_blog_admin eq 'y'} > + <a class="blogt" > href="tiki-blog_post.php?blogId={$listpages[ix].blogId}&postId={$listpages[ix].postId}">{icon > _id='page_edit'}</a> <a class="blogt" > href="tiki-view_blog.php?blogId={$blogId}&remove={$listpages[ix].postId}">{icon > _id='cross' alt='{tr}Remove{/tr}'}</a> > + {/if} > + {if $user and $prefs.feature_notepad eq 'y' and > $tiki_p_notepad eq 'y'} > + <a title="{tr}Save to notepad{/tr}" > href="tiki-view_blog.php?blogId={$blogId}&savenotepad={$listpages[ix].postId}">{icon > _id='disk' alt='{tr}Save to notepad{/tr}'}</a> > + {/if} > +</div> > \ No newline at end of file > > > Property changes on: trunk/templates/blog_actions.tpl > ___________________________________________________________________ > Added: svn:keywords > + Id > > Added: trunk/templates/blog_author_info.tpl > =================================================================== > --- trunk/templates/blog_author_info.tpl > (rev 0) > +++ trunk/templates/blog_author_info.tpl 2010-08-05 > 20:03:52 UTC (rev 28325) > @@ -0,0 +1,15 @@ > +{* $Id$ *} > +<div class="author_info"> > + {if $use_author eq 'y' || $add_date eq 'y'} > + {tr}Published {/tr} > + {/if} > + {if $use_author eq 'y'} > + {tr}by{/tr} {$listpages[ix].user|userlink} > + {/if} > + {if $add_date eq 'y'} > + {$listpages[ix].created|tiki_short_datetime} > + {/if} > + {if $show_avatar eq 'y'} > + {$listpages[ix].avatar} > + {/if} > +</div> > \ No newline at end of file > > > Property changes on: trunk/templates/blog_author_info.tpl > ___________________________________________________________________ > Added: svn:keywords > + Id > > Added: trunk/templates/blog_footer.tpl > =================================================================== > --- trunk/templates/blog_footer.tpl > (rev 0) > +++ trunk/templates/blog_footer.tpl 2010-08-05 20:03:52 UTC > (rev 28325) > @@ -0,0 +1,40 @@ > +{* $Id$ *} > +<div class="postfooter"> > + <div class="actions"> > + <a > href='tiki-print_blog_post.php?postId={$listpages[ix].postId}'>{icon > _id='printer' alt='{tr}Print{/tr}'}</a> > + {if $prefs.feature_blog_sharethis eq "y"} > + {capture name=shared_title}{tr}Share > This{/tr}{/capture} > + {capture > name=shared_link_title}{tr}ShareThis via AIM, social bookmarking > and networking sites, etc.{/tr}{/capture} > + {wiki}{literal}<script > language="javascript" type="text/javascript"> > + //Create your sharelet with > desired properties and set button element to false > + var > object{/literal}{$listpages[ix].postId}{literal} = > SHARETHIS.addEntry({ > + > title:'{/literal}{$smarty.capture.shared_title|replace:'\'':'\\\''}{literal}', > + > url:'{/literal}http://{$hostname}{$smarty.server.SERVER_NAME}{$smarty.server.SCRIPT_NAME|replace:'tiki-view_blog.php':'tiki-view_blog_post.php'}?postId={$listpages[ix].postId}{literal}' > + }, > + {button:false}); > + //Output your customized button > + document.write('<span > id="share{/literal}{$listpages[ix].postId}{literal}"><a > title="{/literal}{$smarty.capture.shared_link_title|replace:'\'':'\\\''}{literal}" > href="javascript:void(0);"><img > src="http://w.sharethis.com/images/share-icon-16x16.png?CXNID=1000014.0NXC" > /></a></span>'); > + //Tie customized button to > ShareThis button functionality. > + var > element{/literal}{$listpages[ix].postId}{literal} = > document.getElementById("share{/literal}{$listpages[ix].postId}{literal}"); > + > object{/literal}{$listpages[ix].postId}{literal}.attachButton(element{/literal}{$listpages[ix].postId}{literal}); > + </script>{/literal}{/wiki} > + {/if} > + </div> > + > + <div class="status"> > + <a class="link" > href="{$listpages[ix].postId|sefurl:blogpost}">{tr}Permalink{/tr}</a> > + {if $allow_comments eq 'y' and > $prefs.feature_blogposts_comments eq 'y' && $tiki_p_read_comments > eq 'y'} > + | <a class="link linkcomments" > href="tiki-view_blog_post.php?find={$find|escape:url}&blogId={$blogId}&offset={$offset}&sort_mode={$sort_mode}&postId={$listpages[ix].postId}&show_comments=1#comments"> > + {if $listpages[ix].comments == 0 && > $tiki_p_post_comments eq 'y'} > + {tr}Leave a comment{/tr} > + {else} > + {$listpages[ix].comments} > + {if $listpages[ix].comments == 1} > + {tr}comment{/tr} > + {else} > + {tr}comments{/tr}</a> > + {/if} > + {/if} > + {/if} > + </div> > +</div> <!--postfooter--> > > > Property changes on: trunk/templates/blog_footer.tpl > ___________________________________________________________________ > Added: svn:keywords > + Id > > Added: trunk/templates/blog_post_actions.tpl > =================================================================== > --- trunk/templates/blog_post_actions.tpl > (rev 0) > +++ trunk/templates/blog_post_actions.tpl 2010-08-05 > 20:03:52 UTC (rev 28325) > @@ -0,0 +1,10 @@ > +{* $Id$ *} > +<div class="actions"> > + {if ($ownsblog eq 'y') or ($user and $post_info.user eq > $user) or $tiki_p_blog_admin eq 'y'} > + <a class="blogt" > href="tiki-blog_post.php?blogId={$post_info.blogId}&postId={$post_info.postId}">{icon > _id='page_edit'}</a> > + <a class="blogt" > href="tiki-view_blog.php?blogId={$post_info.blogId}&remove={$post_info.postId}">{icon > _id='cross' alt='{tr}Remove{/tr}'}</a> > + {/if} > + {if $user and $prefs.feature_notepad eq 'y' and > $tiki_p_notepad eq 'y'} > + <a title="{tr}Save to notepad{/tr}" > href="tiki-view_blog_post.php?blogId={$smarty.request.blogId}&postId={$smarty.request.postId}&savenotepad=1">{icon > _id='disk' alt='{tr}Save to notepad{/tr}'}</a> > + {/if} > +</div> > > > Property changes on: trunk/templates/blog_post_actions.tpl > ___________________________________________________________________ > Added: svn:keywords > + Id > > Added: trunk/templates/blog_post_author_info.tpl > =================================================================== > --- trunk/templates/blog_post_author_info.tpl > (rev 0) > +++ trunk/templates/blog_post_author_info.tpl 2010-08-05 > 20:03:52 UTC (rev 28325) > @@ -0,0 +1,15 @@ > +{* $Id$ *} > +<div class="author_info"> > + {if $blog_data.use_author eq 'y' || $blog_data.add_date eq > 'y'} > + {tr}Published {/tr} > + {/if} > + {if $blog_data.use_author eq 'y'} > + {tr}by{/tr} {$post_info.user|userlink} > + {/if} > + {if $blog_data.add_date eq 'y'} > + {$post_info.created|tiki_short_datetime} > + {/if} > + {if $blog_data.show_avatar eq 'y'} > + {$post_info.avatar} > + {/if} > +</div> > > > Property changes on: trunk/templates/blog_post_author_info.tpl > ___________________________________________________________________ > Added: svn:keywords > + Id > > Added: trunk/templates/blog_post_footer.tpl > =================================================================== > --- trunk/templates/blog_post_footer.tpl > (rev 0) > +++ trunk/templates/blog_post_footer.tpl 2010-08-05 > 20:03:52 UTC (rev 28325) > @@ -0,0 +1,70 @@ > +{* $Id$ *} > +<div class="postfooter"> > + <div class="actions"> > + <a > href='tiki-print_blog_post.php?postId={$postId}'>{icon > _id='printer' alt='{tr}Print{/tr}'}</a> > + {if $prefs.feature_blog_sharethis eq "y"} > + {capture name=shared_title}{tr}Share > This{/tr}{/capture} > + {capture > name=shared_link_title}{tr}ShareThis via AIM, social bookmarking > and networking sites, etc.{/tr}{/capture} > + {wiki}{literal}<script > language="javascript" type="text/javascript"> > + //Create your sharelet with > desired properties and set button element to false > + var > object{/literal}{$postId}{literal} = SHARETHIS.addEntry({ > + > title:'{/literal}{$smarty.capture.shared_title|replace:'\'':'\\\''}{literal}' > + }, > + {button:false}); > + //Output your customized button > + document.write('<span > id="share{/literal}{$postId}{literal}"><a > title="{/literal}{$smarty.capture.shared_link_title|replace:'\'':'\\\''}{literal}" > href="javascript:void(0);"><img > src="http://w.sharethis.com/images/share-icon-16x16.png?CXNID=1000014.0NXC" > /></a></span>'); > + //Tie customized button to > ShareThis button functionality. > + var > element{/literal}{$postId}{literal} = > document.getElementById("share{/literal}{$postId}{literal}"); > + > object{/literal}{$postId}{literal}.attachButton(element{/literal}{$postId}{literal}); > + </script>{/literal}{/wiki} > + {/if} > + </div> > + <div class="status"> > + <a class="link" > href="{$postId|sefurl:blogpost}">{tr}Permalink{/tr}</a> > + {if $post_info.trackbacks_from_count} > + ({tr}referenced by{/tr}: > {$post_info.trackbacks_from_count} > + {/if} > + {if $post_info.trackbacks_to_count} > + {tr}Posts{/tr} {tr}references{/tr}: > {$post_info.trackbacks_to_count} {tr}Posts{/tr}) > + {/if} > + {if $allow_comments eq 'y' and > $prefs.feature_blogposts_comments eq 'y'} > + {$listpages[ix].comments} {tr}comments{/tr} > + [<a class="link" > href="tiki-view_blog_post.php?find={$find}&blogId={$blogId}&offset={$offset}&sort_mode={$sort_mode}&postId={$listpages[ix].postId}">{tr}View > Comments{/tr}</a>] > + {/if} > + </div> > +</div> > +{if $post_info.trackbacks_from_count > 0} > + <h3>{tr}Trackback pings{/tr}:</h3> > + {cycle values="odd,even" print=false} > + <table class="normal"> > + <tr> > + <th>{tr}Title{/tr}</th> > + <th>{tr}URI{/tr}</th> > + <th>{tr}Blog name{/tr}</th> > + {if ($ownsblog eq 'y') or ($user and > $post_info.user eq $user) or $tiki_p_blog_admin eq 'y'} > + <th>{tr}Action{/tr}</th> > + {/if} > + </tr> > + {foreach from=$post_info.trackbacks_from key=key > item=item} > + <tr> > + <td class="{cycle > advance=false}">{$item.title|htmlentities}</td> > + <td class="{cycle advance=false}"><a > href="{$key}" class="link" title="{$key}" > target="_blank">{$key|truncate:"40"|htmlentities}</a></td> > + <td > class="{cycle}">{$item.blog_name|htmlentities}</td> > + {if ($ownsblog eq 'y') or ($user and > $post_info.user eq $user) or $tiki_p_blog_admin eq 'y'} > + <td class="{cycle advance=false}"><a > href="tiki-view_blog_post.php?postId={$postId}&deltrack={$key|urlencode}">{icon > _id='cross' alt='{tr}Remove{/tr}'}</a></td> > + {/if} > + </tr> > + {/foreach} > + </table> > +{/if} > +{if $prefs.feature_blogposts_comments == 'y' > + && ($blog_data.allow_comments == 'y' or > $blog_data.allow_comments == 'c') > + && (($tiki_p_read_comments == 'y' > + && $comments_cant != 0) > + || $tiki_p_post_comments == 'y' > + || $tiki_p_edit_comments == 'y')} > + <div id="page-bar" class="clearfix"> > + {include file='comments_button.tpl'} > + </div> > + {include file='comments.tpl'} > +{/if} > > > Property changes on: trunk/templates/blog_post_footer.tpl > ___________________________________________________________________ > Added: svn:keywords > + Id > > Added: trunk/templates/blog_post_postbody_content.tpl > =================================================================== > --- trunk/templates/blog_post_postbody_content.tpl > (rev 0) > +++ trunk/templates/blog_post_postbody_content.tpl 2010-08-05 > 20:03:52 UTC (rev 28325) > @@ -0,0 +1,22 @@ > +{* $Id$ *} > +<div class="postbody-content"> > + {$parsed_data} > +</div> > +<div class="postbody-pagination"> > + {if $pages > 1} > + <div align="center"> > + <a > href="tiki-view_blog_post.php?blogId={$smarty.request.blogId}&postId={$smarty.request.postId}&page={$first_page}">{icon > _id='resultset_first' alt='{tr}First page{/tr}'}</a> > + <a > href="tiki-view_blog_post.php?blogId={$smarty.request.blogId}&postId={$smarty.request.postId}&page={$prev_page}">{icon > _id='resultset_previous' alt='{tr}Previous page{/tr}'}</a> > + > <small>{tr}page{/tr}:{$pagenum}/{$pages}</small> > + <a > href="tiki-view_blog_post.php?blogId={$smarty.request.blogId}&postId={$smarty.request.postId}&page={$next_page}">{icon > _id='resultset_next' alt='{tr}Next page{/tr}'}</a> > + <a > href="tiki-view_blog_post.php?blogId={$smarty.request.blogId}&postId={$smarty.request.postId}&page={$last_page}">{icon > _id='resultset_last' alt='{tr}Last page{/tr}'}</a> > + </div> > + {/if} > +</div> > +{capture name='copyright_section'} > + {include file='show_copyright.tpl'} > +{/capture} > +{* When copyright section is not empty show it *} > +{if $smarty.capture.copyright_section neq ''} > + <p class="editdate">{$smarty.capture.copyright_section}</p> > +{/if} > > > Property changes on: trunk/templates/blog_post_postbody_content.tpl > ___________________________________________________________________ > Added: svn:keywords > + Id > > Added: trunk/templates/blog_post_postbody_title.tpl > =================================================================== > --- trunk/templates/blog_post_postbody_title.tpl > (rev 0) > +++ trunk/templates/blog_post_postbody_title.tpl 2010-08-05 > 20:03:52 UTC (rev 28325) > @@ -0,0 +1,23 @@ > +{* $Id$ *} > +<div class="clearfix postbody-title"> > + {if $blog_data.use_title eq 'y'} > + <div class="title"> > + <h2>{$post_info.title|escape}</h2> > + </div> > + {/if} > + {if $prefs.feature_freetags eq 'y' and > $tiki_p_view_freetags eq 'y'} > + {if $tags.data|@count >0} > + <div class="freetaglist"> > + {tr}Tags:{/tr} > + {foreach from=$tags.data item=tag} > + {if isset($preview) and > $preview eq 'y'} > + <a class="freetag" > href="#">{$tag.tag}</a> > + {else} > + {capture > name=tagurl}{if (strstr($tag.tag, ' > '))}"{$tag.tag}"{else}{$tag.tag}{/if}{/capture} > + <a class="freetag" > href="tiki-browse_freetags.php?tag={$smarty.capture.tagurl|escape:'url'}">{$tag.tag}</a> > + {/if} > + {/foreach} > + </div> > + {/if} > + {/if} > +</div> > > > Property changes on: trunk/templates/blog_post_postbody_title.tpl > ___________________________________________________________________ > Added: svn:keywords > + Id > > Added: trunk/templates/blog_postbody_title.tpl > =================================================================== > --- trunk/templates/blog_postbody_title.tpl > (rev 0) > +++ trunk/templates/blog_postbody_title.tpl 2010-08-05 > 20:03:52 UTC (rev 28325) > @@ -0,0 +1,19 @@ > +{* $Id$ *} > +<div class="clearfix postbody-title"> > + {if $use_title eq 'y'} > + <div class="title"> {* because used in forums, but > I don't know purpose *} > + <h2><a class="link" > href="{$listpages[ix].postId|sefurl:blogpost}">{$listpages[ix].title|escape}</a></h2> > + </div> > + {/if} > + > + {if $prefs.feature_freetags eq 'y' and > $tiki_p_view_freetags eq 'y'} > + {if $listpages[ix].freetags.data|@count >0} > + <div class="freetaglist">{tr}Tags{/tr}: > + {foreach > from=$listpages[ix].freetags.data item=taginfo} > + {capture name=tagurl}{if > (strstr($taginfo.tag, ' > '))}"{$taginfo.tag}"{else}{$taginfo.tag}{/if}{/capture} > + <a class="freetag" > href="tiki-browse_freetags.php?tag={$smarty.capture.tagurl|escape:'url'}">{$taginfo.tag|escape}</a> > + {/foreach} > + </div> > + {/if} > + {/if} > +</div> > > > Property changes on: trunk/templates/blog_postbody_title.tpl > ___________________________________________________________________ > Added: svn:keywords > + Id > > Added: trunk/templates/blog_wrapper.tpl > =================================================================== > --- trunk/templates/blog_wrapper.tpl > (rev 0) > +++ trunk/templates/blog_wrapper.tpl 2010-08-05 20:03:52 UTC > (rev 28325) > @@ -0,0 +1,24 @@ > +{* $Id$ *} > +<div class="clearfix postbody"> > + {include file='blog_actions.tpl'} > + <a name="postId{$listpages[ix].postId}"></a> > + {include file='blog_postbody_title.tpl'} > + {include file='blog_author_info.tpl'} > + <div class="postbody-content"> > + {$listpages[ix].parsed_data} > + {if $listpages[ix].pages > 1} > + <a class="link more" > href="{$listpages[ix].postId|sefurl:blogpost}"> > + {tr}More...{/tr} ({$listpages[ix].pages} > {tr}pages{/tr})</a> > + {/if} > + {capture name='copyright_section'} > + {include file='show_copyright.tpl'} > + {/capture} > + {* When copyright section is not empty show it *} > + {if $smarty.capture.copyright_section neq ''} > + <p class="editdate"> > + {$smarty.capture.copyright_section} > + </p> > + {/if} > + </div> > + {include file='blog_footer.tpl'} > +</div> <!-- postbody --> > > > Property changes on: trunk/templates/blog_wrapper.tpl > ___________________________________________________________________ > Added: svn:keywords > + Id > > Modified: trunk/templates/tiki-view_blog.tpl > =================================================================== > --- trunk/templates/tiki-view_blog.tpl 2010-08-05 19:57:59 UTC > (rev 28324) > +++ trunk/templates/tiki-view_blog.tpl 2010-08-05 20:03:52 UTC > (rev 28325) > @@ -1,12 +1,11 @@ > {* $Id$ *} > {if !isset($show_heading) or $show_heading neq "n"} > - <div class="breadcrumbs"><a class="link" > href="tiki-list_blogs.php">{tr}Blogs{/tr}</a> > {$prefs.site_crumb_seper} {$title|escape}</div> > {if strlen($heading) > 0 and $prefs.feature_blog_heading eq > 'y'} > {eval var=$heading} > {else} > {include file='blog-heading.tpl'} > {/if} > - > + > <div align="right" > > <span class="blogactions"> > {if $tiki_p_blog_post eq "y"} > @@ -23,7 +22,7 @@ > <a class='bloglink' > href='tiki-list_comments.php?types_section=blogs&blogId={$blogId}'>{icon > _id='comments' alt='{tr}List all comments{/tr}' title='{tr}List > all comments{/tr}'}</a> > {/if} > {/if} > - > + > {if $user and $prefs.feature_user_watches > eq 'y'} > {if $user_watching_blog eq 'n'} > <a > href="tiki-view_blog.php?blogId={$blogId}&watch_event=blog_post&watch_object={$blogId}&watch_action=add" > class="icon">{icon _id='eye' alt='{tr}Monitor this Blog{/tr}'}</a> > @@ -35,14 +34,14 @@ > <a > href="tiki-object_watches.php?objectId={$blogId|escape:"url"}&watch_event=blog_post&objectType=blog&objectName={$title|escape:"url"}&objectHref={'tiki-view_blog.php?blogId='|cat:$blogId|escape:"url"}" > class="icon">{icon _id='eye_group' alt='{tr}Group Monitor{/tr}'}</a> > {/if} > </span> > - > + > {if $user and $prefs.feature_user_watches eq 'y'} > {if $category_watched eq 'y'} > - {tr}Watched by categories{/tr}: > + {tr}Watched by categories:{/tr} > {section name=i > loop=$watching_categories} > <a > href="tiki-browse_categories.php?parentId={$watching_categories[i].categId}" > class="icon">{$watching_categories[i].name}</a> > {/section} > - {/if} > + {/if} > {/if} > </div> > <br /> > @@ -62,117 +61,8 @@ > > {section name=ix loop=$listpages} > <div class="post{if !empty($container_class)} > {$container_class}{/if}"> > - <div class="clearfix postbody"> > - <div class="author_actions clearfix"> > - <div class="actions"> > - {if ($ownsblog eq 'y') or > ($user and $listpages[ix].user eq $user) or $tiki_p_blog_admin eq 'y'} > - <a class="blogt" > href="tiki-blog_post.php?blogId={$listpages[ix].blogId}&postId={$listpages[ix].postId}">{icon > _id='page_edit'}</a> > - <a class="blogt" > href="tiki-view_blog.php?blogId={$blogId}&remove={$listpages[ix].postId}">{icon > _id='cross' alt='{tr}Remove{/tr}'}</a> > - {/if} > - > - {if $user and > $prefs.feature_notepad eq 'y' and $tiki_p_notepad eq 'y'} > - <a title="{tr}Save > to notepad{/tr}" > href="tiki-view_blog.php?blogId={$blogId}&savenotepad={$listpages[ix].postId}">{icon > _id='disk' alt='{tr}Save to notepad{/tr}'}</a> > - {/if} > - </div> > - </div> > - > - <a > name="postId{$listpages[ix].postId}"></a> {* ?? *} > - > - <div class="clearfix postbody-title"> > - {if $use_title eq 'y'} > - <div class="title"> {* > because used in forums, but I don't know purpose *} > - <h2><a > class="link" > href="{$listpages[ix].postId|sefurl:blogpost}">{$listpages[ix].title|escape}</a></h2> > - </div> > - {/if} > - > - {if $prefs.feature_freetags eq 'y' > and $tiki_p_view_freetags eq 'y'} > - {if > $listpages[ix].freetags.data|@count >0} > - <div > class="freetaglist">{tr}Tags{/tr}: > - {foreach > from=$listpages[ix].freetags.data item=taginfo} > - > {capture name=tagurl}{if (strstr($taginfo.tag, ' > '))}"{$taginfo.tag}"{else}{$taginfo.tag}{/if}{/capture} > - <a > class="freetag" > href="tiki-browse_freetags.php?tag={$smarty.capture.tagurl|escape:'url'}">{$taginfo.tag|escape}</a> > - {/foreach} > - </div> > - {/if} > - {/if} > - </div> <!-- posthead --> > - > - <div class="author_info"> > - {if $use_author eq 'y' || > $add_date eq 'y'} > - {tr}Published {/tr} > - {/if} > - > - {if $use_author eq 'y'} > - {tr}by{/tr} > {$listpages[ix].user|userlink} > - {/if} > - > - {if $add_date eq 'y'} > - {tr}on{/tr} > {$listpages[ix].created|tiki_short_date} > - {/if} > - > - {if $show_avatar eq 'y'} > - {$listpages[ix].avatar} > - {/if} > - </div> > - > - {$listpages[ix].parsed_data} > - {if $listpages[ix].pages > 1} > - <a class="link more" > href="{$listpages[ix].postId|sefurl:blogpost}"> > - {tr}More...{/tr} > ({$listpages[ix].pages} {tr}pages{/tr})</a> > - {/if} > - > - {capture name='copyright_section'} > - {include file='show_copyright.tpl'} > - {/capture} > - > - {* When copyright section is not empty > show it *} > - {if $smarty.capture.copyright_section neq ''} > - <p class="editdate"> > - > {$smarty.capture.copyright_section} > - </p> > - {/if} > - > - <div class="postfooter"> > - <div class="status"> {* renamed to > match forum footer layout *} > - <a > href='tiki-print_blog_post.php?postId={$listpages[ix].postId}'>{icon > _id='printer' alt='{tr}Print{/tr}'}</a> > - {if > $prefs.feature_blog_sharethis eq "y"} > - {capture > name=shared_title}{tr}Share This{/tr}{/capture} > - {capture > name=shared_link_title}{tr}ShareThis via AIM, social bookmarking > and networking sites, etc.{/tr}{/capture} > - > {wiki}{literal}<script language="javascript" type="text/javascript"> > - //Create > your sharelet with desired properties and set button element to false > - var > object{/literal}{$listpages[ix].postId}{literal} = > SHARETHIS.addEntry({ > - > title:'{/literal}{$smarty.capture.shared_title|replace:'\'':'\\\''}{literal}', > - > url:'{/literal}http://{$hostname}{$smarty.server.SERVER_NAME}{$smarty.server.SCRIPT_NAME|replace:'tiki-view_blog.php':'tiki-view_blog_post.php'}?postId={$listpages[ix].postId}{literal}' > - }, > - > {button:false}); > - //Output > your customized button > - > document.write('<span > id="share{/literal}{$listpages[ix].postId}{literal}"><a > title="{/literal}{$smarty.capture.shared_link_title|replace:'\'':'\\\''}{literal}" > href="javascript:void(0);"><img > src="http://w.sharethis.com/images/share-icon-16x16.png?CXNID=1000014.0NXC" > /></a></span>'); > - //Tie > customized button to ShareThis button functionality. > - var > element{/literal}{$listpages[ix].postId}{literal} = > document.getElementById("share{/literal}{$listpages[ix].postId}{literal}"); > - > object{/literal}{$listpages[ix].postId}{literal}.attachButton(element{/literal}{$listpages[ix].postId}{literal}); > - > </script>{/literal}{/wiki} > - {/if} > - </div> > - <div class="actions"> {* renamed > to match forum footer layout *} > - <a class="link" > href="{$listpages[ix].postId|sefurl:blogpost}">{tr}Permalink{/tr}</a> > - {if $allow_comments eq 'y' > and $prefs.feature_blogposts_comments eq 'y' && > $tiki_p_read_comments eq 'y'} > - | <a class="link" > href="tiki-view_blog_post.php?blogId={$blogId}&postId={$listpages[ix].postId}#comments"> > - {if > $listpages[ix].comments == 0 && $tiki_p_post_comments eq 'y'} > - {tr}Leave > a comment{/tr} > - {else} > - > {$listpages[ix].comments} > - {if > $listpages[ix].comments == 1} > - > {tr}comment{/tr} > - {else} > - > {tr}comments{/tr}</a> > - {/if} > - {/if} > - {/if} > - </div> > - </div> > - </div> <!-- postbody --> > - </div> <!--blogpost --> > + {include file='blog_wrapper.tpl'} > + </div> > {/section} > > {pagination_links cant=$cant step=$maxRecords > offset=$offset}{/pagination_links} > - > > Modified: trunk/templates/tiki-view_blog_post.tpl > =================================================================== > --- trunk/templates/tiki-view_blog_post.tpl 2010-08-05 > 19:57:59 UTC (rev 28324) > +++ trunk/templates/tiki-view_blog_post.tpl 2010-08-05 > 20:03:52 UTC (rev 28325) > @@ -1,57 +1,12 @@ > -{title help='Blogs' > url="tiki-view_blog.php?blogId=$blogId"}{$blog_data.title|escape}{/title} > -<a class="link" href="tiki-list_blogs.php">{tr}Blogs{/tr}</a> > {$prefs.site_crumb_seper} <a class="link" > href="tiki-view_blog.php?blogId={$post_info.blogId}">{$blog_data.title|escape}</a> > {$prefs.site_crumb_seper} {$post_info.title|escape} > +{include file='blog-post-heading.tpl'} > > <div class="post post_single"> > - <div class="author_actions clearfix"> > - <div class="actions"> > - {if ($ownsblog eq 'y') or ($user and > $post_info.user eq $user) or $tiki_p_blog_admin eq 'y'} > - <a class="blogt" > href="tiki-blog_post.php?blogId={$post_info.blogId}&postId={$post_info.postId}">{icon > _id='page_edit'}</a> > - <a class="blogt" > href="tiki-view_blog.php?blogId={$post_info.blogId}&remove={$post_info.postId}">{icon > _id='cross' alt='{tr}Remove{/tr}'}</a> > - {/if} > - {if $user and $prefs.feature_notepad eq > 'y' and $tiki_p_notepad eq 'y'} > - <a title="{tr}Save to > notepad{/tr}" > href="tiki-view_blog_post.php?blogId={$smarty.request.blogId}&postId={$smarty.request.postId}&savenotepad=1">{icon > _id='disk' alt='{tr}Save to notepad{/tr}'}</a> > - {/if} > - </div> > + <div class="postbody"> > + {include file='blog_post_actions.tpl'}{* actions > split out, info moved below title for vacomm theme *} > + {include file='blog_post_postbody_title.tpl'} > + {include file='blog_post_author_info.tpl'} > + {include file='blog_post_postbody_content.tpl'} > </div> > - > - {include file='tiki-view_blog_post_content.tpl'} > - > - <div class="postfooter"> > - <div class="status"> {* renamed to match forum > footer layout *} > - <a > href='tiki-print_blog_post.php?postId={$postId}'>{icon > _id='printer' alt='{tr}Print{/tr}'}</a> > - {if $prefs.feature_blog_sharethis eq "y"} > - {capture > name=shared_title}{tr}Share This{/tr}{/capture} > - {capture > name=shared_link_title}{tr}ShareThis via AIM, social bookmarking > and networking sites, etc.{/tr}{/capture} > - {wiki}{literal}<script > language="javascript" type="text/javascript"> > - //Create your sharelet > with desired properties and set button element to false > - var > object{/literal}{$postId}{literal} = SHARETHIS.addEntry({ > - > title:'{/literal}{$smarty.capture.shared_title|replace:'\'':'\\\''}{literal}' > - }, > - {button:false}); > - //Output your customized > button > - document.write('<span > id="share{/literal}{$postId}{literal}"><a > title="{/literal}{$smarty.capture.shared_link_title|replace:'\'':'\\\''}{literal}" > href="javascript:void(0);"><img > src="http://w.sharethis.com/images/share-icon-16x16.png?CXNID=1000014.0NXC" > /></a></span>'); > - //Tie customized button to > ShareThis button functionality. > - var > element{/literal}{$postId}{literal} = > document.getElementById("share{/literal}{$postId}{literal}"); > - > object{/literal}{$postId}{literal}.attachButton(element{/literal}{$postId}{literal}); > - </script>{/literal}{/wiki} > - {/if} > - </div> > - <div class="actions"> {* renamed to match forum > footer layout *} > - <a class="link" > href="{$postId|sefurl:blogpost}">{tr}Permalink{/tr}</a> > - {if $allow_comments eq 'y' and > $prefs.feature_blogposts_comments eq 'y'} > - {$listpages[ix].comments} > {tr}comments{/tr} > - [<a class="link" > href="tiki-view_blog_post.php?find={$find}&blogId={$blogId}&offset={$offset}&sort_mode={$sort_mode}&postId={$listpages[ix].postId}">{tr}View > Comments{/tr}</a>] > - {/if} > - </div> > - </div> > + {include file='blog_post_footer.tpl'} > </div> > > -{if $prefs.feature_blogposts_comments == 'y' > - && ($blog_data.allow_comments == 'y' or > $blog_data.allow_comments == 'c') > - && (($tiki_p_read_comments == 'y' > - && $comments_cant != 0) > - || $tiki_p_post_comments == 'y' > - || $tiki_p_edit_comments == 'y')} > - {assign var='show_comzone' value='y'} > - {include file='comments.tpl'} > -{/if} > > > This was sent by the SourceForge.net collaborative development > platform, the world's largest Open Source development site. > > ------------------------------------------------------------------------------ > This SF.net email is sponsored by > > Make an app they can't live without > Enter the BlackBerry Developer Challenge > http://p.sf.net/sfu/RIM-dev2dev > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > <mailto:Tik...@li...> > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > > > ------------------------------------------------------------------------ > > ------------------------------------------------------------------------------ > This SF.net email is sponsored by > > Make an app they can't live without > Enter the BlackBerry Developer Challenge > http://p.sf.net/sfu/RIM-dev2dev > ------------------------------------------------------------------------ > > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > > ------------------------------------------------------------------------ > > > No virus found in this incoming message. > Checked by AVG - www.avg.com > Version: 9.0.851 / Virus Database: 271.1.1/3054 - Release Date: 08/06/10 16:37:00 > > |
![http://w.sharethis.com/images/share-icon-16x16.png?CXNID=1000014.0NXC"](http://w.sharethis.com/images/share-icon-16x16.png?CXNID=1000014.0NXC"){kind=link}