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

4 files changed, 96 insertions, 36 deletions

diff --git a/templates/board.tpl b/templates/board.tpl
index c0161c7..ea7c254 100644
--- a/templates/board.tpl
+++ b/templates/board.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_boards/templates/Attic/board.tpl,v 1.5 2006/07/26 22:45:30 hash9 Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_boards/templates/Attic/board.tpl,v 1.6 2006/07/27 23:00:40 hash9 Exp $ *}
 {strip}
 <div class="floaticon">{bithelp}</div>
 
@@ -14,7 +14,17 @@
 			<input type="hidden" name="sort_mode" value="{$control.sort_mode|escape}" />
 
 			<table class="mb-table">
-
+				{if !$gBitSystem->isFeatureActive('bitboards_thread_verbrose')}
+					<th width="1">{if $boardsList.0.track.on}<small>UBSI</small>{/if}</td>
+					<th style="text-align:left;white-space: nowrap;">Title</td><br />
+					{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;">Topics</td>
+					<th style="text-align: center;">Last Topic</td>
+					<th style="text-align: center;">Poster</td>
+					<th style="text-align: right;">Updated</td>
+				{/if}
 				{foreach item=board from=$boardsList}
 				{if $board.title}
 					{assign var=board_title value=$board.title|escape}
@@ -31,11 +41,27 @@
 							{biticon ipackage=bitboard iname="track_old_l" iexplain="No New Posts"}
 						{/if}
 					</td>
-						<td><a href="{$board.url}" title="{$board_title}">{$board_title}</a></td>
-
-					{if $gBitUser->hasPermission('p_bitboards_edit') || $gBitUser->hasPermission('p_bitboards_post_edit')}
-					<td style="text-align:right;">{if $board.unreg > 0}<a style="color: blue;" href="{$board.url}" title="{$board.title|escape}">{$board.unreg}&nbsp;Unregistered&nbsp;Posts</a>{/if}</td>{/if}
-					<td style="text-align:right; color: blue;">{if $board.post_count > 0}{$board.post_count}&nbsp;Threads</a>{/if}</td>
+					<td><a href="{$board.url}" title="{$board_title}">{$board_title}</a><div style="margin-left:2em;" class="small">{$board.parsed_data}</blockquote></td>
+					{if $gBitSystem->isFeatureActive('bitboards_thread_verbrose')}
+						{if $gBitUser->hasPermission('p_bitboards_edit') || $gBitUser->hasPermission('p_bitboards_post_edit')}
+							<td style="text-align:right;">{if $board.unreg > 0}<a style="color: blue;" href="{$board.url}" title="{$board.title|escape}">{$board.unreg}&nbsp;Unregistered&nbsp;Posts</a>{/if}</td>
+						{/if}
+						<td style="text-align:right; color: blue;">{if $board.post_count > 0}{$board.post_count}&nbsp;Threads</a>{/if}</td>
+					{else}
+						{if $gBitUser->hasPermission('p_bitboards_edit') || $gBitUser->hasPermission('p_bitboards_post_edit')}
+							<td style="text-align:center;">{if $board.unreg > 0}<a style="color: blue;" href="{$board.url}" title="{$board.title|escape}">{$board.unreg}</a>{/if}</td>
+						{/if}
+						<td style="text-align:center;">{if $board.post_count > 0}{$board.post_count}</a>{/if}</td>
+						{if !empty($board.last)}
+						<td style="text-align:center;"><a href="{$board.last.url}">{$board.last.title}</td>
+						<td style="text-align:center;">{if $board.last.user_id < 0}{$board.last.l_anon_name|escape}{else}{displayname user_id=$board.last.user_id}{/if}</td>
+						<td style="text-align:right;">{if $board.last.last_modified > 0}{$board.last.last_modified|reltime}</a>{/if}</td>
+						{else}
+						<td></td>
+						<td></td>
+						<td></td>
+						{/if}
+					{/if}
 					</tr>
 				{foreachelse}
 					<tr class="norecords"><td colspan="16">
diff --git a/templates/post.tpl b/templates/post.tpl
index 519e3e7..8cfb594 100644
--- a/templates/post.tpl
+++ b/templates/post.tpl
@@ -1,14 +1,10 @@
-{* $Header: /cvsroot/bitweaver/_bit_boards/templates/Attic/post.tpl,v 1.7 2006/07/26 22:45:30 hash9 Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_boards/templates/Attic/post.tpl,v 1.8 2006/07/27 23:00:40 hash9 Exp $ *}
 {strip}
 <div class="floaticon">
 {assign var=flip value=$thread->getFlipFlop()}
 {foreach from=$flip item=flip_s key=flip_name}
 		{include file="bitpackage:bitboards/flipswitch.tpl"}
 {/foreach}
-{*{assign var=flip_name value="locked"}
-{include file="bitpackage:bitboards/flipswitch.tpl"}
-{assign var=flip_name value="sticky"}
-{include file="bitpackage:bitboards/flipswitch.tpl"}*}
 {if !$topic_locked}<a title="{tr}Post on this thread{/tr}" href="{$comments_return_url}&post_comment_reply_id={$thread->mInfo.flc_content_id}&post_comment_request=1#editcomments"> {biticon ipackage=bitboard iname="mail_new" iexplain="Post on this thread"}</a>{/if}
 
 {bithelp}</div>
@@ -40,7 +36,9 @@
 			<tr><td colspan="10"><h2 style="text-align:center; padding:.5em">{tr}{$post_title} Preview{/tr}</h2></td></tr>
 			<tr>
 			<div class="preview">
+				{assign var=post_is_preview value=1}
 				{displaycomment comment=$postComment template=$comment_template}
+				{assign var=post_is_preview value=0}
 			</div><!-- end .preview -->
 			</tr>
 			<tr><td colspan="10">&nbsp;</td></tr>
diff --git a/templates/post_display.tpl b/templates/post_display.tpl
index 57876ea..bf69165 100644
--- a/templates/post_display.tpl
+++ b/templates/post_display.tpl
@@ -39,7 +39,7 @@
 <td valign="top" width="0" class="mb-avatar">
 {if $gBitUser->getPreference('boards_show_avatars','y')==y}
 	<strong>{if $comment.user_id < 0}{$comment.anon_name|escape}{else}{displayname hash=$comment}{/if}</strong><br />
-	{if $comment.user_id >= 0}
+	{if $comment.user_id >= 0 && !empty($comment.user_avatar_url)}
 	<a href="{$comment.user_url}"><img src="{$comment.user_avatar_url}" class="thumb" title="{tr}Avatar{/tr}" alt="{tr}Avatar{/tr}" /></a><br />
 	<small>{tr}Joined: {/tr}{$comment.registration_date|bit_short_date}</small><br />
 	{else}
@@ -54,6 +54,7 @@
 {/if}
 <a name="{$comment.comment_id|escape}" id="{$comment.comment_id|escape}">
 <div class="display bitboard">
+	{if !$post_is_preview}
 	<div class="floaticon">
 		{if $print_page ne 'y' && $comment.deleted==0 }
 			{if $gBitUser->hasPermission( 'p_bitboards_edit' ) && (($comment.user_id<0 && $comment.approved==0)||$comment.user_id>=0) && !$comment.warned}
@@ -94,6 +95,9 @@
 			{if !$topic_locked && $gBitUser->hasPermission( 'p_liberty_post_comments' )}
 				<a href="{$comments_return_url}&amp;post_comment_reply_id={$comment.content_id}&amp;post_comment_request=1#editcomments" rel="nofollow">{biticon ipackage="liberty" iname="reply" iexplain="Reply to this Post"}</a>
 			{/if}
+			{if !$topic_locked && $gBitUser->hasPermission( 'p_liberty_post_comments' )}
+				<a href="{$comments_return_url}&amp;post_comment_reply_id={$comment.content_id}&amp;post_comment_request=1&amp;quote=y#editcomments" rel="nofollow">{biticon ipackage="liberty" iname="reply_quote" iexplain="Reply with Quote to this Post"}</a>
+			{/if}
 			{if $comment.editable}
 				<a href="{$comments_return_url}&amp;post_comment_id={$comment.comment_id}&amp;post_comment_request=1#editcomments" rel="nofollow">{biticon ipackage="liberty" iname="edit" iexplain="Edit"}</a>
 			{/if}
@@ -102,6 +106,7 @@
 			{/if}
 		{/if}<!-- end print_page -->
 	</div><!-- end .floaticon -->
+	{/if}
 
 	<div class="header">
 		{if $comment.title neq ""}<h3>{$comment.title|escape}</h3>{/if}
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 */