Various bits of cleanup for displaying. Fixed bugs with displaying threaded with and without threading. Hid icons for posting and topic creation for those that don't have permissions. Made titles display the thread or board name. Commented out home board from admin since home doesn't use it.

4 files changed, 20 insertions, 15 deletions

diff --git a/templates/admin_bitboards.tpl b/templates/admin_bitboards.tpl
index 51c84ac..083adf6 100644
--- a/templates/admin_bitboards.tpl
+++ b/templates/admin_bitboards.tpl
@@ -1,5 +1,6 @@
 {strip}
 {form}
+{*
 	{legend legend="Home Message Board"}
 		<input type="hidden" name="page" value="{$page}" />
 		<div class="row">
@@ -19,7 +20,7 @@
 			<input type="submit" name="homeTabSubmit" value="{tr}Change preferences{/tr}" />
 		</div>
 	{/legend}
-
+*}
 	{legend legend="List Settings"}
 		<input type="hidden" name="page" value="{$page}" />
 		{foreach from=$formBitBoardsLists key=item item=output}
diff --git a/templates/list_posts.tpl b/templates/list_posts.tpl
index 0230cc3..a4dcaa6 100644
--- a/templates/list_posts.tpl
+++ b/templates/list_posts.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_boards/templates/list_posts.tpl,v 1.3 2007/01/08 04:58:38 spiderr Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_boards/templates/list_posts.tpl,v 1.4 2007/02/16 22:38:20 nickpalmer Exp $ *}
 {strip}
 	<div class="boards breadcrumb">
 		&laquo; {tr}Back to{/tr} <a href="{$board->mInfo.display_url}">{$board->mInfo.title|escape}</a>
@@ -42,8 +42,8 @@
 		{/form}
 		</div>
 
-		{if !$topic_locked}
-			<a title="{tr}Post Reply{/tr}" class="button" href="{$comments_return_url}&amp;post_comment_reply_id={$thread->mInfo.flc_content_id}&amp;post_comment_request=1#editcomments">{biticon ipackage="icons" iname="mail-reply-sender" iexplain="Post Reply" iforce="icon"} {tr}Post Reply{/tr}</a>
+		{if !$topic_locked && $gBitUser->hasPermission( 'p_liberty_post_comments' )}
+				<a title="{tr}Post Reply{/tr}" class="button" href="{$comments_return_url}&amp;post_comment_reply_id={$thread->mInfo.flc_content_id}&amp;post_comment_request=1#editcomments">{biticon ipackage="icons" iname="mail-reply-sender" iexplain="Post Reply" iforce="icon"} {tr}Post Reply{/tr}</a>
 		{/if}
 
 		{formfeedback hash=$formfeedback}
@@ -68,7 +68,7 @@
 			</div><!-- end .preview -->
 		{/if}
 
-		{if !$topic_locked}
+		{if !$topic_locked && $gBitUser->hasPermission( 'p_liberty_post_comments' )}
 			<div class="navbar">
 				<a title="{tr}Post Reply{/tr}" class="button" href="{$comments_return_url}&amp;post_comment_reply_id={$thread->mInfo.flc_content_id}&amp;post_comment_request=1#editcomments">{biticon ipackage="icons" iname="mail-reply-sender" iexplain="Post Reply" iforce="icon"} {tr}Post Reply{/tr}</a>
 			</div>
diff --git a/templates/list_topics.tpl b/templates/list_topics.tpl
index 24b22ab..c37e006 100644
--- a/templates/list_topics.tpl
+++ b/templates/list_topics.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_boards/templates/list_topics.tpl,v 1.6 2007/01/14 13:10:00 squareing Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_boards/templates/list_topics.tpl,v 1.7 2007/02/16 22:38:20 nickpalmer Exp $ *}
 {strip}
 <div class="listing bitboard">
 	<div class="floaticon">
@@ -23,9 +23,11 @@
 	<div class="body">
 		{minifind sort_mode=$sort_mode b=$smarty.request.b}
 		{* looks horrible, but leave for now - xing *}
-		<div class="navbar">
-			<a title="{tr}New Topic{/tr}" href="{$comments_return_url}&amp;post_comment_request=1#editcomments">{tr}New Topic{/tr} {biticon ipackage="icons" iname="mail-message-new" iexplain="New Topic"}</a>
-		</div>
+		{if $gBitUser->hasPermission( 'p_liberty_post_comments' )}
+			<div class="navbar">
+				<a title="{tr}New Topic{/tr}" href="{$comments_return_url}&amp;post_comment_request=1#editcomments">{tr}New Topic{/tr} {biticon ipackage="icons" iname="mail-message-new" iexplain="New Topic"}</a>
+			</div>
+		{/if}
 
 		{form id="checkform"}
 			<input type="hidden" name="board_id" value="{$smarty.request.board_id}" />
@@ -152,9 +154,11 @@
 				{/foreach}
 			</table>
 
-			<div class="navbar">
-				<a class="button" title="{tr}New Topic{/tr}" href="{$comments_return_url}&amp;post_comment_request=1#editcomments">{biticon ipackage="icons" iname="mail-message-new" iexplain="New Topic" iforce="icon"} {tr}New Topic{/tr}</a>
-			</div>
+			{if $gBitUser->hasPermission( 'p_liberty_post_comments' )}
+				<div class="navbar">
+					<a class="button" title="{tr}New Topic{/tr}" href="{$comments_return_url}&amp;post_comment_request=1#editcomments">{biticon ipackage="icons" iname="mail-message-new" iexplain="New Topic" iforce="icon"} {tr}New Topic{/tr}</a>
+				</div>
+			{/if}
 
 			{if $gBitUser->hasPermission( 'p_bitboards_remove' )}
 				<div style="text-align:right;">
diff --git a/templates/post_display.tpl b/templates/post_display.tpl
index 840bac9..93c6dd1 100644
--- a/templates/post_display.tpl
+++ b/templates/post_display.tpl
@@ -2,7 +2,7 @@
 {assign var='gContent' value=$comment}
 
 <div class="body" id="{$comment.comment_id|escape}">
-	<div class="content" {if $comments_style eq 'threaded'}style="padding-left:{math equation="level * marginIncrement +3 " level=$comment.level marginIncrement=20}px"{/if}>
+	<div class="content" {if $comments_style eq 'threaded' || $gBitUser->getPreference('boards_show_avatars','y') == y}style="{if $comments_style eq 'threaded'}padding-left:{math equation="level * marginIncrement +3 " level=$comment.level marginIncrement=20}px;{/if}{if $gBitUser->getPreference('boards_show_avatars','y') == y}margin-left: 200px;b{/if}"{/if}>
 		{if !$post_is_preview}
 			<div class="floaticon">
 				{if $print_page ne 'y' && $comment.deleted==0 }
@@ -118,8 +118,8 @@
 	</div><!-- end .content -->
 </div>
 
+{if $gBitUser->getPreference('boards_show_avatars','y') == y}
 <div class="userinfo">
-	{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 && !empty($comment.user_avatar_url)}
@@ -129,8 +129,8 @@
 		{else}
 			<small>{tr}Anonymous User{/tr}</small><br />
 		{/if}
-	{/if}
 </div>
+{/if}
 
 <div class="signature"> </div>
 {/strip}