From b3f697de17baa39ed858e9c4979fe33869767fa6 Mon Sep 17 00:00:00 2001
From: Max Kremmel <xing@synapse.plus.com>
Date: Sun, 17 Jul 2005 17:36:47 +0000
Subject: Merge recent changes from R1 to HEAD - never doing this again.

---
 templates/show_page.tpl | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'templates/show_page.tpl')

diff --git a/templates/show_page.tpl b/templates/show_page.tpl
index 7117fcf..ebeca68 100644
--- a/templates/show_page.tpl
+++ b/templates/show_page.tpl
@@ -1,10 +1,18 @@
+{if $comments_at_top_of_page eq 'y' and $print_page ne 'y' and $feature_wiki_comments eq 'y' }
+	{include file="bitpackage:wiki/page_header.tpl"}
+	{include file="bitpackage:liberty/comments.tpl"}
+{/if}
+
 <div class="display wiki {$pageInfo.title|lower|regex_replace:"[\s|_]":""}">
 	{include file="bitpackage:wiki/page_icons.tpl"}
 	{include file="bitpackage:wiki/page_header.tpl"}
+
 	{if $gBitSystem->isPackageActive( 'stickies' )}
 		{include file="bitpackage:stickies/display_bitsticky.tpl"}
 	{/if}
+
 	{include file="bitpackage:wiki/page_display.tpl"}
+
 	{if $pages > 1}
 		<div class="pagination">
 			{*<a title="{tr}First page{/tr}" href="index.php?page_id={$pageInfo.page_id}&amp;pagenum={$first_page}">&laquo; &laquo;</a>*}
@@ -19,11 +27,8 @@
 		{$footnote}
 	{/if}
 
-	{if $print_page ne 'y'}
-		{include file="bitpackage:wiki/page_action_bar.tpl"}
-	{/if}
 
-	{if $gBitSystemPrefs.wiki_feature_copyrights eq 'y'}
+	{if $gBitSystem->isFeatureActive( 'wiki_feature_copyrights' )}
 		<p class="copyright">
 			{if $pageCopyrights}
 				{section name=i loop=$pageCopyrights}
@@ -38,11 +43,16 @@
 		</p>
 	{/if}
 
-	{if $print_page ne 'y' and $feature_wiki_comments eq 'y' }
-		{include file="bitpackage:liberty/comments.tpl"}
+	{if $print_page ne 'y'}
+		{include file="bitpackage:wiki/page_action_bar.tpl"}
 	{/if}
 
 	{if $gBitSystem->isPackageActive( 'categories' )}
 		{include file="bitpackage:categories/categories_objects.tpl"}
 	{/if}
 </div><!-- end .wiki -->
+
+{if $comments_at_top_of_page ne 'y' and $print_page ne 'y' and $feature_wiki_comments eq 'y' }
+	{include file="bitpackage:liberty/comments.tpl"}
+{/if}
+
-- 
cgit v1.3