Menu
▾
▴
[Tikiwiki-cvs] tiki/templates tiki-print_forum_thread.tpl, NONE, 1.1.2.1 comments.tpl, 1.98.2.7, 1.98.2.8 tiki-admin-include-forums.tpl, 1.26.2.4, 1.26.2.5 tiki-view_forum.tpl, 1.111.2.14, 1.111.2.15 tiki-view_forum_thread.tpl, 1.83, 1.83.2.1
Update of /cvsroot/tikiwiki/tiki/templates In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26669/templates Modified Files: Tag: BRANCH-1-10 comments.tpl tiki-admin-include-forums.tpl tiki-view_forum.tpl tiki-view_forum_thread.tpl Added Files: Tag: BRANCH-1-10 tiki-print_forum_thread.tpl Log Message: [NEW] forums: two new features: * Topics archiving : this feature can be enabled in forums admin panels and allows forum admins to hide complete topics from the list of topics without having to delete them. This can be done either on the topics list of a forum, or on the view_forum_thread page, * Thread printing : users are now able to print a thread. There is two different icons to do this : one to print the current page only, the other to print the whole thread (i.e. not limited to a max of posts). --- NEW FILE: tiki-print_forum_thread.tpl --- {* $Header: /cvsroot/tikiwiki/tiki/templates/Attic/tiki-print_forum_thread.tpl,v 1.1.2.1 2008/01/08 16:01:42 nyloth Exp $ *} <div style="margin:10px 20px 0px 20px"> <h1>{tr}Forum{/tr}: {$forum_info.name}</h1> <div class="top_post">{include file="comment.tpl" first='y' comment=$thread_info thread_style='commentStyle_plain'}</div> {include file="comments.tpl"} <br /> <p class="editdate"> {tr}The original document is available at{/tr} <a href="{$base_url}tiki-view_forum_thread.php?{query fullscreen=NULL print=NULL}">{$base_url}tiki-view_forum_thread.php?{query fullscreen=NULL print=NULL}</a> </p> </div> Index: comments.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/comments.tpl,v retrieving revision 1.98.2.7 retrieving revision 1.98.2.8 diff -u -d -r1.98.2.7 -r1.98.2.8 --- comments.tpl 19 Dec 2007 22:31:15 -0000 1.98.2.7 +++ comments.tpl 8 Jan 2008 16:01:41 -0000 1.98.2.8 @@ -149,19 +149,20 @@ </div> {/if} + {if $comments_cant_pages gt 1} <div class="mini"> - {if $comments_prev_offset >= 0} + {if $comments_prev_offset >= 0 && ! (isset($print_page) && $print_page eq 'y')} [<a class="prevnext" href="{$comments_complete_father}comments_threshold={$comments_threshold}&comments_parentId={$comments_parentId}&comments_offset={$comments_prev_offset}{$thread_sort_mode_param}&comments_per_page={$comments_per_page}&thread_style={$thread_style}">{tr}Prev{/tr}</a>] {/if} {tr}Page{/tr}: {$comments_actual_page}/{$comments_cant_pages} - {if $comments_next_offset >= 0} + {if $comments_next_offset >= 0 && ! (isset($print_page) && $print_page eq 'y')} [<a class="prevnext" href="{$comments_complete_father}comments_threshold={$comments_threshold}&comments_parentId={$comments_parentId}&comments_offset={$comments_next_offset}{$thread_sort_mode_param}&comments_per_page={$comments_per_page}&thread_style={$thread_style}">{tr}Next{/tr}</a>] {/if} - {if $prefs.direct_pagination eq 'y'} + {if $prefs.direct_pagination eq 'y' && ! (isset($print_page) && $print_page eq 'y')} <br /> {section loop=$comments_cant_pages name=foo} {assign var=selector_offset value=$smarty.section.foo.index|times:$comments_per_page} @@ -170,6 +171,7 @@ {/section} {/if} </div> + {/if} </div> {/if} Index: tiki-admin-include-forums.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-admin-include-forums.tpl,v retrieving revision 1.26.2.4 retrieving revision 1.26.2.5 diff -u -d -r1.26.2.4 -r1.26.2.5 --- tiki-admin-include-forums.tpl 8 Dec 2007 16:03:59 -0000 1.26.2.4 +++ tiki-admin-include-forums.tpl 8 Jan 2008 16:01:42 -0000 1.26.2.5 @@ -37,6 +37,10 @@ <td><input type="checkbox" name="feature_forum_parse" {if $prefs.feature_forum_parse eq 'y'}checked="checked"{/if}/></td> </tr><tr class="form"> + <td><label>{tr}Enable topics archiving{/tr}:</label></td> + <td><input type="checkbox" name="feature_forum_topics_archiving" + {if $prefs.feature_forum_topics_archiving eq 'y'}checked="checked"{/if}/></td> + </tr><tr class="form"> <td><label>{tr}Allow first posts of a thread to have an empty body (will be a thread title){/tr}:</label></td> <td><input type="checkbox" name="feature_forums_allow_thread_titles" {if $prefs.feature_forums_allow_thread_titles eq 'y'}checked="checked"{/if}/></td> Index: tiki-view_forum.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-view_forum.tpl,v retrieving revision 1.111.2.14 retrieving revision 1.111.2.15 diff -u -d -r1.111.2.14 -r1.111.2.15 --- tiki-view_forum.tpl 18 Dec 2007 15:51:46 -0000 1.111.2.14 +++ tiki-view_forum.tpl 8 Jan 2008 16:01:42 -0000 1.111.2.15 @@ -408,6 +408,15 @@ <a href="tiki-view_forum.php?openpost=1&comments_threadId={$comments_coms[ix].threadId}&forumId={$forum_info.forumId}&comments_threshold={$comments_threshold}&comments_offset={$comments_offset}&thread_sort_mode={$thread_sort_mode}&comments_per_page={$comments_per_page}" class="admlink">{html_image file='pics/icons/page_edit.png' border='0' width="16" height="16" alt='{tr}Edit{/tr}' title='{tr}Edit{/tr}'}</a> {/if} + + {if $prefs.feature_forum_topics_archiving eq 'y' && $tiki_p_admin_forum eq 'y'} + {if $comments_coms[ix].archived eq 'y'} + <a href="{$smarty.server.PHP_SELF}?{query archive="n" comments_parentId=$comments_coms[ix].threadId}" title="{tr}Unarchive{/tr}">{html_image file='pics/icons/package_go.png' border='0' alt='{tr}Unarchive{/tr}' title='{tr}Unarchive{/tr}'}</a> + {else} + <a href="{$smarty.server.PHP_SELF}?{query archive="y" comments_parentId=$comments_coms[ix].threadId}" title="{tr}Archive{/tr}">{html_image file='pics/icons/package.png' border='0' alt='{tr}Archive{/tr}' title='{tr}Archive{/tr}'}</a> + {/if} + {/if} + {if $tiki_p_admin_forum eq 'y' } <a href="tiki-view_forum.php?comments_remove=1&comments_threadId={$comments_coms[ix].threadId}&forumId={$forum_info.forumId}&comments_threshold={$comments_threshold}&comments_offset={$comments_offset}&thread_sort_mode={$thread_sort_mode}&comments_per_page={$comments_per_page}" class="admlink"><img src="pics/icons/cross.png" border="0" width="16" height="16" alt='{tr}Remove{/tr}' title='{tr}Remove{/tr}' /></a> Index: tiki-view_forum_thread.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-view_forum_thread.tpl,v retrieving revision 1.83 retrieving revision 1.83.2.1 diff -u -d -r1.83 -r1.83.2.1 --- tiki-view_forum_thread.tpl 4 Oct 2007 22:17:43 -0000 1.83 +++ tiki-view_forum_thread.tpl 8 Jan 2008 16:01:42 -0000 1.83.2.1 @@ -1,6 +1,6 @@ {* $Header$ *} -<h1><a href="tiki-view_forum.php?topics_offset={$smarty.request.topics_offset}{$topics_sort_mode_param}{$topics_threshold_param}{$topics_find_param}&forumId={$forum_info.forumId}" class="pagetitle">{tr}Forum{/tr}: {$forum_info.name}</a></h1> +<h1><a href="tiki-view_forum.php?topics_offset={$smarty.request.topics_offset}{$topics_sort_mode_param}{$topics_threshold_param}{$topics_find_param}&forumId={$forum_info.forumId}" class="pagetitle">{tr}Forum{/tr}: {$forum_info.name}</a>{if $prefs.feature_forum_topics_archiving eq 'y' && $thread_info.archived eq 'y'}<em>({tr}Archived{/tr})</em>{/if}</h1> {if $unread > 0} <a class='link' href='messu-mailbox.php'>{tr}You have{/tr} {$unread} {tr} unread private messages{/tr}<br /><br /></a> @@ -21,10 +21,24 @@ <a class="link" href="tiki-forums.php">{tr}Forums{/tr}</a>-><a class="link" href="tiki-view_forum.php?forumId={$forumId}">{$forum_info.name}</a>{if $thread_info.topic.threadId}-><a class="link" href="tiki-view_forum_thread.php?topics_offset={$smarty.request.topics_offset}{$topics_sort_mode_param}{$topics_threshold_param}{$topics_find_param}&forumId={$forumId}&comments_parentId={$thread_info.topic.threadId}">{$thread_info.topic.title}</a>{/if}-><a class="link" href="tiki-view_forum_thread.php?topics_offset={$smarty.request.topics_offset}{$topics_sort_mode_param}{$topics_threshold_param}{$topics_find_param}&forumId={$forumId}&comments_parentId={$smarty.request.comments_parentId}">{$thread_info.title}</a> <div style="text-align: right; margin-bottom: 15px;"> + <span> {if ($prev_topic and $prev_topic ne $comments_parentId) or $next_topic}[{if $prev_topic and $prev_topic ne $comments_parentId}<a href="tiki-view_forum_thread.php?forumId={$forumId}&comments_parentId={$prev_topic}&topics_offset={$topics_prev_offset}{$topics_sort_mode_param}{$topics_threshold_param}{$topics_find_param}{$comments_per_page_param}{$thread_style_param}{$thread_sort_mode_param}{$comments_threshold_param}" class="link">{tr}prev topic{/tr}</a>{if $next_topic} | {/if}{/if} {if $next_topic}<a href="tiki-view_forum_thread.php?forumId={$forumId}&comments_parentId={$next_topic}&topics_offset={$topics_next_offset}{$topics_sort_mode_param}{$topics_threshold_param}{$topics_find_param}{$comments_per_page_param}{$thread_style_param}{$thread_sort_mode_param}{$comments_threshold_param}" class="link">{tr}next topic{/tr}</a>{/if}]{/if} + </span> + <span style="margin-left:10px;"> + <a href="{$smarty.server.PHP_SELF}?{query print="page"}" title="{tr}Print this page only{/tr}"><img width="16" height="16" border="0" alt="{tr}Print this page only{/tr}" src="pics/icons/printer.png"/></a> + <a href="{$smarty.server.PHP_SELF}?{query print="all"}" title="{tr}Print all pages{/tr}"><img width="16" height="16" border="0" alt="{tr}Print all pages{/tr}" src="pics/icons/printer_add.png"/></a> + {if $prefs.feature_forum_topics_archiving eq 'y' && $tiki_p_admin_forum eq 'y'} + {if $thread_info.archived eq 'y'} + <a href="{$smarty.server.PHP_SELF}?{query archive="n"}" title="{tr}Unarchive{/tr}">{html_image file='pics/icons/package_go.png' border='0' alt='{tr}Unarchive{/tr}' title='{tr}Unarchive{/tr}'}</a> + {else} + <a href="{$smarty.server.PHP_SELF}?{query archive="y"}" title="{tr}Archive{/tr}">{html_image file='pics/icons/package.png' border='0' alt='{tr}Archive{/tr}' title='{tr}Archive{/tr}'}</a> + {/if} + {/if} + </span> </div> + {if $openpost eq 'y'} {assign var="postclass" value="forumpostopen"} {else} |