Merge recent changes from R1 to HEAD - never doing this again.

1 files changed, 48 insertions, 10 deletions

diff --git a/templates/comments.tpl b/templates/comments.tpl
index fba694b..ef508d3 100644
--- a/templates/comments.tpl
+++ b/templates/comments.tpl
@@ -8,7 +8,7 @@
 		{/if}
 		<h2>
 			<a onclick="icntoggle('bitcomments');">
-				{biticon ipackage=liberty iname="collapsed" id="bitcommentsimg" iexplain="folder"} {tr}Comments{/tr}
+				{biticon ipackage=liberty iname="collapsed" id="bitcommentsimg" iexplain=""} {tr}Comments{/tr}
 			</a>
 		</h2>
 	</div>
@@ -25,12 +25,6 @@
 	<div class="body">
 		{formfeedback hash=$formfeedback}
 
-		{section name=ix loop=$comments}
-			{displaycomment comment="$comments[ix]"}
-		{/section}
-
-		{libertypagination hash=$commentsPgnHash}
-
 		{if $post_comment_preview}
 			<h2>{tr}Comments Preview{/tr}</h2>
 			<div class="preview">
@@ -39,6 +33,9 @@
 		{/if}
 
 		{form action="`$comments_return_url`#editcomments"}
+			<input type="hidden" name="comments_maxComments" value="{$maxComments}" />
+			<input type="hidden" name="comments_style" value="{$comments_style}" />
+			<input type="hidden" name="comments_sort_mode" value="{$comments_sort_mode}" />
 			{if $post_comment_request || $post_comment_preview}
 				<a name="editcomments"></a>
 				{legend legend="Post Comment"}
@@ -54,11 +51,11 @@
 					</div>
 
 					{assign var=textarea_id value="commentpost"}
-					{if $gBitSystemPrefs.package_smileys eq 'y'}
+					{if $gBitSystem->isPackageActive( 'smileys' )}
 						{include file="bitpackage:smileys/smileys_full.tpl"}
 					{/if}
 
-					{if $gBitSystemPrefs.package_quicktags eq 'y'}
+					{if $gBitSystem->isPackageActive( 'quicktags' )}
 						{include file="bitpackage:quicktags/quicktags_full.tpl" formId="commentpost"}
 					{/if}
 
@@ -81,8 +78,49 @@
 				</div>
 			{/if}
 		{/form}
-	</div><!-- end .body -->
 
+		{if $comments and $gBitSystem->isFeatureActive( 'comments_display_option_bar' )}
+			{form action="`$comments_return_url`#editcomments"}
+				<input type="hidden" name="post_comment_reply_id" value="{$post_comment_reply_id}" />
+				<input type="hidden" name="post_comment_id" value="{$post_comment_id}" />
+				<table class="optionbar">
+					<tr>
+						<td>
+							<label for="comments-maxcomm">{tr}Messages{/tr} </label>
+							<select name="comments_maxComments" id="comments-maxcomm">
+								<option value="10" {if $maxComments eq 10}selected="selected"{/if}>10</option>
+								<option value="20" {if $maxComments eq 20}selected="selected"{/if}>20</option>
+								<option value="50" {if $maxComments eq 50}selected="selected"{/if}>50</option>
+								<option value="100" {if $maxComments eq 100}selected="selected"{/if}>100</option>
+								<option value="999999" {if $maxComments eq 999999}selected="selected"{/if}>All</option>
+							</select>
+						</td>
+						<td>
+							<label for="comments-style">{tr}Style{/tr} </label>
+							<select name="comments_style" id="comments-style">
+								<option value="flat" {if $comments_style eq "flat"}selected="selected"{/if}>Flat</option>
+								<option value="threaded" {if $comments_style eq "threaded"}selected="selected"{/if}>Threaded</option>
+							</select>
+						</td>
+						<td>
+							<label for="comments-sort">{tr}Sort{/tr} </label>
+							<select name="comments_sort_mode" id="comments-sort">
+								<option value="commentDate_desc" {if $comments_sort_mode eq "commentDate_desc"}selected="selected"{/if}>Newest first</option>
+								<option value="commentDate_asc" {if $comments_sort_mode eq "commentDate_asc"}selected="selected"{/if}>Oldest first</option>
+							</select> 
+						</td>
+						<td style="text-align:right"><input type="submit" name="comments_setOptions" value="set" /></td>
+					</tr>
+				</table>
+			{/form}
+		{/if}
+
+		{section name=ix loop=$comments}
+			{displaycomment comment="$comments[ix]"}
+		{/section}
+
+		{libertypagination hash=$commentsPgnHash}
+	</div><!-- end .body -->
 {/strip}
 	<script type="text/javascript">
 	//<![CDATA[