Fix unregistered post count column, Add column baised layout, and allow posts to be replied to using the new reply with quote feature of comments, Improve moderation, move to board if rejecting a new topic, premit topic to be moderated from the topic list for the board

1 files changed, 54 insertions, 23 deletions

diff --git a/templates/topic.tpl b/templates/topic.tpl
index bd11074..4ee7367 100644
--- a/templates/topic.tpl
+++ b/templates/topic.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_boards/templates/Attic/topic.tpl,v 1.6 2006/07/26 22:45:30 hash9 Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_boards/templates/Attic/topic.tpl,v 1.7 2006/07/27 23:00:41 hash9 Exp $ *}
 {strip}
 <div class="listing bitboard">
 	<div class="floaticon">
@@ -14,21 +14,16 @@
 	<div class="header">
 		<h1>{$board->mInfo.title|escape|default:"Forum Topic"} <a id='content_1' href="{$comments_return_url}&show={if empty($smarty.request.show)}1{else}0{/if}" onclick="{literal}if (this.innerHTML=='-') { document.getElementById('content_div').style.display='none'; this.innerHTML='+'; } else { document.getElementById('content_div').style.display='block'; this.innerHTML='-'; } return false;{/literal}">{if empty($smarty.request.show)}+{else}-{/if}</a></h1>
 		<div class="date">
-			{tr}Created by{/tr}: {displayname user=$board->mInfo.creator_user user_id=$board->mInfo.creator_user_id real_name=$board->mInfo.creator_real_name} on {$board->getField('created')|bit_short_datetime}
-
-			{if $board->getField('last_modified') != $board->getField('created')}
-				&nbsp; {tr}Edited by{/tr}: {displayname user=$board->mInfo.modifier_user user_id=$board->mInfo.modifier_user_id real_name=$board->mInfo.modifier_real_name}, {$board->getField('last_modified')|bit_short_datetime}
-			{/if}
+			<div id="content_div" class="content" style="text-align: right; {if empty($smarty.request.show)}display: none;{/if}">
+				{$board->mInfo.parsed_data}
+			</div><!-- end .content -->
 		</div>
 
 		Back to <a href="{$cat_url}">{$board->mInfo.content_type.content_description}s</a>
 	</div>
 
 	<div class="body">
-		<div id="content_div" class="content" style="text-align: right; {if empty($smarty.request.show)}display: none;{/if}">
-			{$board->mInfo.parsed_data}
-		</div><!-- end .content -->
-		<p style="text-align: right; margin: 0px; padding: 0px;"><a title="{tr}Start a new thread{/tr}" href="{$comments_return_url}&amp;post_comment_request=1#editcomments">{tr}Start a new thread{/tr} {biticon ipackage=bitboard iname="mail_new" iexplain="Start a new thread"}</a></p>
+		<p style="text-align: right; margin: 0px; padding: 0px;"><a title="{tr}Start a new thread{/tr}" href="{$comments_return_url}&amp;post_comment_request=1#editcomments">{tr}Start a new topic{/tr} {biticon ipackage=bitboard iname="mail_new" iexplain="Start a new topic"}</a></p>
 		{minifind sort_mode=$sort_mode board_id=$smarty.request.board_id}
 		{form id="checkform"}
 			<input type="hidden" name="board_id" value="{$smarty.request.board_id}" />
@@ -36,33 +31,70 @@
 			<input type="hidden" name="sort_mode" value="{$control.sort_mode|escape}" />
 
 			<table class="mb-table">
+				{if ! $gBitSystem->isFeatureActive('bitboards_thread_verbrose')}
+					<th width="1" colspan="{$threadList.0.flip|@count}"><small>{if $gBitUser->isRegistered()}U{/if}TSI</small></td>
+					<th style="text-align:left;white-space: nowrap;">Title</td>
+					<th style="text-align: center;">Topic Starter</td>
+					<th style="text-align: left;">Started</td>
+					<th width="1" style="text-align: center;">Replies</td>
+					{if $gBitUser->hasPermission('p_bitboards_edit') || $gBitUser->hasPermission('p_bitboards_post_edit')}
+						<th style="text-align: center;">Anon</td>
+					{/if}
+					<th style="text-align: center;">Last Poster</td>
+					<th style="text-align: right;">Updated</td>
+					{if $gBitUser->hasPermission('p_bitboards_edit')}
+						<th colspan="4" style="text-align: center;">Actions</td>
+					{/if}
+				{/if}
 				{foreach item=thread from=$threadList}
 				{cycle values="even,odd" print=false assign=cycle_var}
 				<tr class="
- 					{$cycle_var} {if $thread.unreg > 0} mb-{$cycle_var}-unapproved
+ 					{$cycle_var} {if $gBitSystem->isFeatureActive('bitboards_post_anon_moderation') &&  $thread.unreg > 0} mb-{$cycle_var}-unapproved
 					{elseif $thread.th_moved>0} mb-{$cycle_var}-moved
 					{/if}
 					{if $thread.th_sticky==1} mb-sticky{/if}">
-					<td class="actionicon">{* thread status icons *}
-						{if $thread.th_moved>0}
+					{if $thread.th_moved>0}
+					<td class="actionicon" width="1" colspan="{$thread.flip|@count}">{* thread status icons *}
 							{biticon ipackage=bitboard iname="move" iexplain="Moved Thread"}
-						{/if}
 					</td>
+					{else}
 					{assign var=flip value=$thread.flip}
 					{foreach from=$flip item=flip_s key=flip_name}
-						<td class="actionicon">{* thread status icons *}
-							{if $thread.th_moved<=0}
+						<td class="actionicon" width="1">{* thread status icons *}
 								{include file="bitpackage:bitboards/flipswitch.tpl"}
-							{/if}
 						</td>
 					{/foreach}
+					{/if}
+					{if $gBitSystem->isFeatureActive('bitboards_thread_verbrose')}
 					<td>
-						<a href="{$thread.url}" title="{$thread.title|escape}">{$thread.title|escape}</a>, started by {if $thread.flc_user_id < 0}{$thread.first_unreg_uname|escape}{else}{displayname user_id=$thread.flc_user_id}{/if} {$thread.flc_created|reltime|escape}{if $thread.post_count > 1}, with {$thread.post_count|escape} posts,
-						last update by {if $thread.llc_user_id < 0}{$thread.llc_anon_name|escape}{else}{displayname user_id=$thread.llc_user_id}{/if} {$thread.llc_last_modified|reltime|escape}{/if}
+						<a href="{$thread.url}" title="{$thread.title|escape}">{$thread.title|escape}</a>, started by {if $thread.flc_user_id < 0}{$thread.anon_name|escape}{else}{displayname user_id=$thread.flc_user_id}{/if} {$thread.flc_created|reltime|escape}{if $thread.post_count > 1}, with {$thread.post_count|escape} posts,
+						last update by {if $thread.llc_user_id < 0}{$thread.l_anon_name|escape}{else}{displayname user_id=$thread.llc_user_id}{/if} {$thread.llc_last_modified|reltime|escape}{/if}
 					</td>
 					{if $gBitUser->hasPermission('p_bitboards_edit') || $gBitUser->hasPermission('p_bitboards_post_edit')}
-					<td style="text-align:right;">{if $thread.unreg > 0}<a style="color: blue;" href="{$thread.url}" title="{$thread.title}">{$thread.unreg}&nbsp;Unregistered&nbsp;Posts</a>{/if}</td>
-						{if ($gBitUser->hasPermission( 'p_bitboards_edit' )||$gBitUser->hasPermission( 'p_bitboards_remove' ))}
+						<td style="text-align:right;">{if $thread.unreg > 0}<a style="color: blue;" href="{$thread.url}" title="{$thread.title}">{$thread.unreg}&nbsp;Unregistered&nbsp;Posts</a>{/if}</td>
+					{/if}
+					{else}
+					<td style="white-space: nowrap;"><a href="{$thread.url}" title="{$thread.title|escape}">{$thread.title|escape}</a></td>
+					<td style="text-align: center;">{if $thread.flc_user_id < 0}{$thread.anon_name|escape}{else}{displayname user_id=$thread.flc_user_id}{/if}</td>
+					<td>{$thread.flc_created|reltime:short|escape}</td>
+					<td width="1" style="text-align: center;">{$thread.post_count-1|escape}</td>
+					{if $gBitUser->hasPermission('p_bitboards_edit') || $gBitUser->hasPermission('p_bitboards_post_edit')}
+						<td style="text-align:center;">{if $thread.unreg > 0}<a style="color: blue;" href="{$thread.url}" title="{$thread.title}">{$thread.unreg}</a>{/if}</td>
+					{/if}
+					<td style="text-align: center;">{if $thread.post_count > 1}{if $thread.llc_user_id < 0}{$thread.l_anon_name|escape}{else}{displayname user_id=$thread.llc_user_id}{/if}{else}{/if}</td>
+					<td style="text-align: right;">{if $thread.post_count > 1}{$thread.llc_last_modified|reltime:short|escape}{else}{/if}</td>
+					{/if}
+						{if $gBitUser->hasPermission('p_bitboards_edit') || $gBitUser->hasPermission('p_bitboards_post_edit')}
+							<td class="actionicon">
+								{if $thread.flc_user_id<0 && $thread.first_approved==0}
+									<a title="{tr}Approve First Post{/tr}" href="{$smarty.const.BITBOARDS_PKG_URL}topic.php?b={$board->mInfo.board_id}&action=1&comment_id={$thread.th_thread_id}">
+										{biticon ipackage=bitboard iname="edit_add" iexplain="Approve First Post"}
+									</a>
+									<a title="{tr}Reject First Post{/tr}" href="{$smarty.const.BITBOARDS_PKG_URL}topic.php?b={$board->mInfo.board_id}&action=2&comment_id={$thread.th_thread_id}">
+										{biticon ipackage=bitboard iname="edit_remove" iexplain="Reject First Post"}
+									</a>
+								{/if}
+							</td>
 							<td class="actionicon">
 							{if $thread.th_moved==0}
 								{if $gBitUser->hasPermission( 'p_bitboards_edit' )}
@@ -105,7 +137,6 @@
 								{/if}
 							</td>
 						{/if}
-					{/if}
 					</tr>
 				{foreachelse}
 					<tr class="norecords"><td colspan="16">
@@ -114,7 +145,7 @@
 				{/foreach}
 			</table>
 
-			<p style="text-align: right;"><a title="{tr}Start a new thread{/tr}" href="{$comments_return_url}&amp;post_comment_request=1#editcomments">{tr}Start a new thread{/tr} {biticon ipackage=bitboard iname="mail_new" iexplain="Start a new thread"}</a></p>
+			<p style="text-align: right;"><a title="{tr}Start a new thread{/tr}" href="{$comments_return_url}&amp;post_comment_request=1#editcomments">{tr}Start a new topic{/tr} {biticon ipackage=bitboard iname="mail_new" iexplain="Start a new topic"}</a></p>
 			{if $gBitUser->hasPermission( 'p_bitboards_remove' )}
 				<div style="text-align:right;">
 					<script type="text/javascript">/* <![CDATA[ check / uncheck all */