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

16 files changed, 207 insertions, 227 deletions

diff --git a/templates/admin_wiki.tpl b/templates/admin_wiki.tpl
index 1e28cf1..a72d5eb 100644
--- a/templates/admin_wiki.tpl
+++ b/templates/admin_wiki.tpl
@@ -193,30 +193,6 @@
 				</div>
 			{/legend}
 
-			{legend legend="Wiki comments settings"}
-				<div class="row">
-					{formlabel label="Default number of comments per page" for="wiki_comments_per_page"}
-					{forminput}
-						<input size="5" type="text" name="wiki_comments_per_page" id="wiki_comments_per_page" value="{$wiki_comments_per_page|escape}" />
-					{/forminput}
-				</div>
-
-				<div class="row">
-					{formlabel label="Comments default ordering" for="wiki_comments_default_ordering"}
-					{forminput}
-						<select name="wiki_comments_default_ordering" id="wiki_comments_default_ordering">
-							<option value="comment_date_desc" {if $wiki_comments_default_ordering eq 'comment_date_desc'}selected="selected"{/if}>{tr}Newest first{/tr}</option>
-							<option value="comment_date_asc" {if $wiki_comments_default_ordering eq 'comment_date_asc'}selected="selected"{/if}>{tr}Oldest first{/tr}</option>
-							<option value="points_desc" {if $wiki_comments_default_ordering eq 'points_desc'}selected="selected"{/if}>{tr}Points{/tr}</option>
-						</select>
-					{/forminput}
-				</div>
-
-				<div class="row submit">
-					<input type="submit" name="wikiprefs" value="{tr}Change preferences{/tr}" />
-				</div>
-			{/legend}
-
 			{legend legend="Wiki Link Format"}
 				<div class="row">
 					{formlabel label="Wiki Link Format" for="wiki_page_regex"}
@@ -304,7 +280,7 @@
 {/jstabs}
 {/strip}
 
-{if $gBitSystem->mPrefs.package_tiki_forums eq 'y'}
+{if $gBitSystem->mPrefs->isPackageActive( 'tiki_forums' )}
 			<div class="boxcontent">
 				<form method="post" action="{$gBitLoc.KERNEL_PKG_URL}admin/index.php?page=wiki">
 				<table class="panel"><tr>
diff --git a/templates/center_wiki_page.tpl b/templates/center_wiki_page.tpl
index 8f7e6e0..407b78f 100644
--- a/templates/center_wiki_page.tpl
+++ b/templates/center_wiki_page.tpl
@@ -38,7 +38,7 @@
 		<div class="header"><h1>{$gContent->mInfo.title}</h1></div>
 	{/if}
 	<div class="content">
-		{if $gBitSystemPrefs.liberty_auto_display_attachment_thumbs eq 'y'}
+		{if $gBitSystem->isFeatureActive( 'liberty_auto_display_attachment_thumbs' )}
 			{include file="bitpackage:liberty/storage_thumbs.tpl"}
 		{/if}
 		{$gContent->mInfo.parsed_data}
diff --git a/templates/copyrights.tpl b/templates/copyrights.tpl
index e1ad414..1f29f37 100644
--- a/templates/copyrights.tpl
+++ b/templates/copyrights.tpl
@@ -44,7 +44,7 @@
 		{/section}
 		{/legend}
 
-		{form legend="Add a new copyright setting gor `$pageInfo.title`"}
+		{form legend="Add a new copyright setting for `$pageInfo.title`"}
 			<input type="hidden" name="page_id" value="{$pageInfo.page_id}" />
 			<div class="row">
 				{formlabel label="Title" for="copyleft-tit"}
diff --git a/templates/edit_book.tpl b/templates/edit_book.tpl
index c2a5057..8c13158 100755
--- a/templates/edit_book.tpl
+++ b/templates/edit_book.tpl
@@ -1,13 +1,11 @@
 <div class="floaticon">{bithelp}</div>
 
-<div class="admin structure">
-<div class="header">
-<h1>{tr}Edit Wiki Book{/tr}</h1>
-</div>
+<div class="edit structure">
+	<div class="header">
+		<h1>{tr}Edit Wiki Book{/tr}</h1>
+	</div>
 
-<div class="body">
-
-{include file="bitpackage:liberty/edit_structure.tpl"}
-
-</div> {* end .body *}
-</div> {* end .admin *}
+	<div class="body">
+		{include file="bitpackage:liberty/edit_structure.tpl"}
+	</div><!-- end .body -->
+</div><!-- end .edit -->
diff --git a/templates/edit_page.tpl b/templates/edit_page.tpl
index d2157fd..c95a194 100644
--- a/templates/edit_page.tpl
+++ b/templates/edit_page.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_wiki/templates/edit_page.tpl,v 1.3 2005/06/28 07:46:29 spiderr Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_wiki/templates/edit_page.tpl,v 1.4 2005/07/17 17:36:47 squareing Exp $ *}
 <div class="floaticon">{bithelp}</div>
 
 <div class="admin wiki">
@@ -51,14 +51,14 @@
 							{formlabel label="$conDescr Title" for="title"}
 							{forminput}
 								{if $gBitUser->hasPermission( 'bit_p_rename' ) || !$pageInfo.page_id}
-									<input type="text" size="60" maxlength="200" name="title" id="title" value="{$pageInfo.title}" />
+									<input type="text" size="50" maxlength="200" name="title" id="title" value="{$pageInfo.title}" />
 								{else}
 									{$page} {$pageInfo.title}
 								{/if}
 							{/forminput}
 						</div>
 
-						{if $gBitSystemPrefs.feature_wiki_templates eq 'y' and $gBitUser->hasPermission( 'bit_p_use_content_templates' )}
+						{if $gBitSystem->isFeatureActive( 'feature_wiki_templates' ) and $gBitUser->hasPermission( 'bit_p_use_content_templates' )}
 							<div class="row">
 								{formlabel label="Apply template" for="template_id"}
 								{forminput}
@@ -72,11 +72,11 @@
 							</div>
 						{/if}
 
-						{if $gBitSystemPrefs.feature_wiki_description eq 'y'}
+						{if $gBitSystem->isFeatureActive( 'feature_wiki_description' )}
 							<div class="row">
 								{formlabel label="Description" for="description"}
 								{forminput}
-									<input size="60" type="text" name="description" id="description" value="{$pageInfo.description}" />
+									<input size="50" type="text" name="description" id="description" value="{$pageInfo.description}" />
 									{formhelp note="Brief description of the page. This is visible when you hover over a link to this page and just below the title of the wiki page."}
 								{/forminput}
 							</div>
@@ -110,7 +110,7 @@
 							<div class="row">
 								{formlabel label="Comment" for="comment"}
 								{forminput}
-									<input size="60" type="text" name="comment" id="comment" value="{$pageInfo.comment}" />
+									<input size="50" type="text" name="comment" id="comment" value="{$pageInfo.comment}" />
 									{formhelp note="Add a comment to illustrate your most recent changes."}
 								{/forminput}
 							</div>
@@ -139,7 +139,7 @@
 					{/legend}
 				{/jstab}
 
-				{if $gBitSystemPrefs.package_categories eq 'y'}
+				{if $gBitSystem->isPackageActive( 'categories' )}
 					{jstab title="Categorize"}
 						{legend legend="Categorize"}
 							{include file="bitpackage:categories/categorize.tpl"}
@@ -160,7 +160,7 @@
 
 						{include file="bitpackage:liberty/edit_format.tpl"}
 
-						{if $gBitSystemPrefs.wiki_feature_copyrights eq 'y'}
+						{if $gBitSystem->isFeatureActive( 'wiki_feature_copyrights' )}
 							<div class="row">
 								{formlabel label="Copyright" for="copyrightTitle"}
 								{forminput}
@@ -198,7 +198,7 @@
 							</div>
 						{/if}
 
-						{if $gBitSystemPrefs.feature_wiki_icache eq 'y'}
+						{if $gBitSystem->isFeatureActive( 'feature_wiki_icache' )}
 							<div class="row">
 								{formlabel label="Cache" for="wiki_cache"}
 								{forminput}
@@ -238,20 +238,20 @@
 						{/if}
 					{/legend}
 
-					{if $gBitSystemPrefs.package_nexus eq 'y'}
+					{if $gBitSystem->isPackageActive( 'nexus' )}
 						{legend legend="Insert Link in Menu"}
 							{include file="bitpackage:nexus/insert_menu_item_inc.tpl"}
 						{/legend}
 					{/if}
 				{/jstab}
 
-				{if $gBitSystemPrefs.feature_wiki_url_import eq 'y'}
+				{if $gBitSystem->isFeatureActive( 'feature_wiki_url_import' )}
 				{jstab title="Import HMTL"}
 					{legend legend="Import HMTL"}
 						<div class="row">
 							{formlabel label="Import HTML from URL" for="suck_url"}
 							{forminput}
-								<input type="text" size="60" name="suck_url" id="suck_url" value="{$suck_url|escape}" />
+								<input type="text" size="50" name="suck_url" id="suck_url" value="{$suck_url|escape}" />
 								{formhelp note=""}
 							{/forminput}
 						</div>
diff --git a/templates/list_books.tpl b/templates/list_books.tpl
index 827c41d..7ee0f3a 100644
--- a/templates/list_books.tpl
+++ b/templates/list_books.tpl
@@ -31,7 +31,7 @@
 				<a href="{$gBitLoc.WIKI_PKG_URL}edit_book.php?action=export_tree&structure_id={$channels[ix].structure_id}">{biticon ipackage="wiki" iname="tree" iexplain="dump tree"}</a>
 *}
 				{if $gBitUser->isAdmin()}
-					{if $gBitSystemPrefs.package_nexus eq 'y'}
+					{if $gBitSystem->isPackageActive( 'nexus' )}
 						<a href="{$gBitLoc.NEXUS_PKG_URL}menus.php?structure_id={$channels[ix].structure_id}&amp;action=convert_structure">{biticon ipackage="liberty" iname="tree" iexplain="create menu from structure"}</a>
 					{/if}
 					<a href="{$gBitLoc.WIKI_PKG_URL}create_webhelp.php?structure_id={$channels[ix].structure_id}">{biticon ipackage="wiki" iname="webhelp" iexplain="create webhelp"}</a>
diff --git a/templates/list_pages.tpl b/templates/list_pages.tpl
index cbf0c3b..b5fd45d 100644
--- a/templates/list_pages.tpl
+++ b/templates/list_pages.tpl
@@ -1,9 +1,9 @@
-{* $Header: /cvsroot/bitweaver/_bit_wiki/templates/list_pages.tpl,v 1.1 2005/06/19 06:12:45 bitweaver Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_wiki/templates/list_pages.tpl,v 1.2 2005/07/17 17:36:47 squareing Exp $ *}
 <div class="floaticon">{bithelp}</div>
 
 <div class="admin wiki">
 	<div class="header">
-		<h1>{tr}WikiPages{/tr}</h1>
+		<h1>{if $pagetitle ne ''}{$pagetitle}{else}{tr}WikiPages{/tr}{/if}</h1>
 	</div>
 
 	{formfeedback error=$errors}
@@ -14,16 +14,16 @@
 			<div class="navbar">
 				<ul>
 					<li>{biticon ipackage=liberty iname=sort iexplain="sort by"}</li>
-					{if $gBitSystemPrefs.wiki_list_name eq 'y'}
+					{if $gBitSystem->isFeatureActive( 'wiki_list_name' )}
 						<li>{smartlink ititle="Page Name" isort="title" offset=$offset}</li> 
 					{/if}
-					{if $gBitSystemPrefs.wiki_list_lastmodif eq 'y'}
+					{if $gBitSystem->isFeatureActive( 'wiki_list_lastmodif' )}
 						<li>{smartlink ititle="Last Modified" iorder="desc" idefault=1 isort="last_modified" offset=$offset}</li> 
 					{/if}
-					{if $gBitSystemPrefs.wiki_list_creator eq 'y'}
+					{if $gBitSystem->isFeatureActive( 'wiki_list_creator' )}
 						<li>{smartlink ititle="Author" isort="creator_user" offset=$offset}</li> 
 					{/if}
-					{if $gBitSystemPrefs.wiki_list_user eq 'y'}
+					{if $gBitSystem->isFeatureActive( 'wiki_list_user' )}
 						<li>{smartlink ititle="Last Editor" isort="modifier_user" offset=$offset}</li> 
 					{/if}
 				</ul>
@@ -44,39 +44,39 @@
 					{else}
 					  {assign var='checkboxes_on' value='n'}
 					{/if}
-					{if $gBitSystemPrefs.wiki_list_hits eq 'y'}
+					{if $gBitSystem->isFeatureActive( 'wiki_list_hits' )}
 						<th>{smartlink ititle="Hits" isort="hits" offset=$offset}</th> 
 						{counter name=cols assign=cols print=false}
 					{/if}
-					{if $gBitSystemPrefs.wiki_list_lastver eq 'y'}
+					{if $gBitSystem->isFeatureActive( 'wiki_list_lastver' )}
 						<th>{smartlink ititle="Last Version" isort="version" offset=$offset}</th> 
 						{counter name=cols assign=cols print=false}
 					{/if}
-					{if $gBitSystemPrefs.wiki_list_comment eq 'y'}
+					{if $gBitSystem->isFeatureActive( 'wiki_list_comment' )}
 						<th>{smartlink ititle="Comment" isort="comment" offset=$offset}</th> 
 						{counter name=cols assign=cols print=false}
 					{/if}
-					{if $gBitSystemPrefs.wiki_list_status eq 'y'}
+					{if $gBitSystem->isFeatureActive( 'wiki_list_status' )}
 						<th>{smartlink ititle="Status" isort="flag" offset=$offset}</th> 
 						{counter name=cols assign=cols print=false}
 					{/if}
-					{if $gBitSystemPrefs.wiki_list_versions eq 'y'}
+					{if $gBitSystem->isFeatureActive( 'wiki_list_versions' )}
 						<th>{smartlink ititle="Version" isort="versions" offset=$offset}</th> 
 						{counter name=cols assign=cols print=false}
 					{/if}
-					{if $gBitSystemPrefs.wiki_list_links eq 'y'}
+					{if $gBitSystem->isFeatureActive( 'wiki_list_links' )}
 						<th>{smartlink ititle="Links" isort="links" offset=$offset}</th> 
 						{counter name=cols assign=cols print=false}
 					{/if}
-					{if $gBitSystemPrefs.wiki_list_backlinks eq 'y'}
+					{if $gBitSystem->isFeatureActive( 'wiki_list_backlinks' )}
 						<th>{smartlink ititle="Backlinks" isort="backlinks" offset=$offset}</th> 
 						{counter name=cols assign=cols print=false}
 					{/if}
-					{if $gBitSystemPrefs.wiki_list_format_guid eq 'y'}
+					{if $gBitSystem->isFeatureActive( 'wiki_list_format_guid' )}
 						<th>{smartlink ititle="GUID" isort="format_guid" offset=$offset}</th> 
 						{counter name=cols assign=cols print=false}
 					{/if}
-					{if $gBitSystemPrefs.wiki_list_size eq 'y'}
+					{if $gBitSystem->isFeatureActive( 'wiki_list_size' )}
 						<th>{smartlink ititle="Size" isort="size" offset=$offset}</th> 
 						{counter name=cols assign=cols print=false}
 					{/if}
@@ -90,16 +90,16 @@
 				{section name=changes loop=$listpages}
 					<tr class="{cycle advance=false}">
 						<td colspan="{$cols}">
-							{if $gBitSystemPrefs.wiki_list_name eq 'y'}
+							{if $gBitSystem->isFeatureActive( 'wiki_list_name' )}
 								<h3><a href="{$listpages[changes].display_url}" title="{$listpages[changes].description}">{$listpages[changes].title}</a></h3>
 							{else}
 								<a href="{$gBitLoc.WIKI_PKG_URL}index.php?page_id={$listpages[changes].page_id}" title="{$listpages[changes].page_id}">Page #{$listpages[changes].page_id}</a>
 							{/if}
-							{if $gBitSystemPrefs.wiki_list_creator eq 'y'}
+							{if $gBitSystem->isFeatureActive( 'wiki_list_creator' )}
 								{tr}Created by{/tr} {displayname real_name=$listpages[changes].creator_real_name user=$listpages[changes].creator_user}
 							{/if}
 							, {$listpages[changes].created|bit_short_datetime}
-							{if $gBitSystemPrefs.wiki_list_lastmodif eq 'y' && ($listpages[changes].version > 1)}
+							{if $gBitSystem->isFeatureActive( 'wiki_list_lastmodif' ) && ($listpages[changes].version > 1)}
 								<br />
 								{tr}Last modified{/tr}
 								{if $listpages[changes].editor != $listpages[changes].creator}
@@ -110,16 +110,16 @@
 						</td>
 					</tr>
 					<tr class="{cycle}">
-						{if $gBitSystemPrefs.wiki_list_hits eq 'y'}
+						{if $gBitSystem->isFeatureActive( 'wiki_list_hits' )}
 							<td style="text-align:center;">{$listpages[changes].hits}</td>
 						{/if}
-						{if $gBitSystemPrefs.wiki_list_lastver eq 'y'}
+						{if $gBitSystem->isFeatureActive( 'wiki_list_lastver' )}
 							<td style="text-align:center;">{$listpages[changes].version}</td>
 						{/if}
-						{if $gBitSystemPrefs.wiki_list_comment eq 'y'}
+						{if $gBitSystem->isFeatureActive( 'wiki_list_comment' )}
 							<td>{$listpages[changes].comment}</td>
 						{/if}
-						{if $gBitSystemPrefs.wiki_list_status eq 'y'}
+						{if $gBitSystem->isFeatureActive( 'wiki_list_status' )}
 							<td style="text-align:center;">
 								{if $listpages[changes].flag eq 'locked'}
 									{biticon ipackage="wiki" iname="locked" iexplain="locked"}
@@ -128,27 +128,27 @@
 								{/if}
 							</td>
 						{/if}
-						{if $gBitSystemPrefs.wiki_list_versions eq 'y'}
-							{if $gBitSystemPrefs.feature_history eq 'y'}
+						{if $gBitSystem->isFeatureActive( 'wiki_list_versions' )}
+							{if $gBitSystem->isFeatureActive( 'feature_history' )}
 								<td style="text-align:center;">{smartlink ititle=$listpages[changes].version ifile='page_history.php' page_id=$listpages[changes].page_id}</td>
 							{else}
 								<td style="text-align:center;">{$listpages[changes].version}</td>
 							{/if}
 						{/if}
-						{if $gBitSystemPrefs.wiki_list_links eq 'y'}
+						{if $gBitSystem->isFeatureActive( 'wiki_list_links' )}
 							<td style="text-align:center;">{$listpages[changes].links|default:"0"}</td>
 						{/if}
-						{if $gBitSystemPrefs.wiki_list_backlinks eq 'y'}
-							{if $gBitSystemPrefs.feature_backlinks eq 'y' && $listpages[changes].backlinks > 0}
+						{if $gBitSystem->isFeatureActive( 'wiki_list_backlinks' )}
+							{if $gBitSystem->isFeatureActive( 'feature_backlinks' ) && $listpages[changes].backlinks > 0}
 								<td style="text-align:center;"><a href="{$gBitLoc.WIKI_PKG_URL}backlinks.php?page={$listpages[changes].title|escape:"url"}">{$listpages[changes].backlinks|default:"0"}</a></td>
 							{else}
 								<td style="text-align:center;">{$listpages[changes].backlinks|default:"0"}</td>
 							{/if}
 						{/if}
-						{if $gBitSystemPrefs.wiki_list_format_guid eq 'y'}
+						{if $gBitSystem->isFeatureActive( 'wiki_list_format_guid' )}
 							<td>{$listpages[changes].format_guid}</td>
 						{/if}
-						{if $gBitSystemPrefs.wiki_list_size eq 'y'}
+						{if $gBitSystem->isFeatureActive( 'wiki_list_size' )}
 							<td style="text-align:right;">{$listpages[changes].len|kbsize}</td>
 						{/if}
 						{if $gBitUser->hasPermission( 'bit_p_edit' )}
@@ -198,6 +198,10 @@
 					</noscript>
 				</div>
 			{/if}
+
+			<p class="total small">
+				{tr}Total number of entries{/tr}: {$pagecount}
+			</p>
 		{/form}
 
 		{pagination}
diff --git a/templates/menu_wiki.tpl b/templates/menu_wiki.tpl
index a2b49d4..2b46547 100644
--- a/templates/menu_wiki.tpl
+++ b/templates/menu_wiki.tpl
@@ -3,37 +3,37 @@
 	{if $gBitUser->hasPermission( 'bit_p_view' )}
 		<li><a class="item" href="{$gBitLoc.WIKI_PKG_URL}index.php">{biticon ipackage=liberty iname=home iexplain="Wiki Home" iforce="icon"} {tr}Wiki Home{/tr}</a></li>
 	{/if}
-	{if $gBitSystemPrefs.feature_listPages eq 'y' and $gBitUser->hasPermission( 'bit_p_view' )}
+	{if $gBitSystem->isFeatureActive( 'feature_listPages' ) and $gBitUser->hasPermission( 'bit_p_view' )}
 		<li><a class="item" href="{$gBitLoc.WIKI_PKG_URL}list_pages.php">{biticon ipackage=liberty iname=list iexplain="List pages" iforce="icon"} {tr}List pages{/tr}</a></li>
 	{/if}
 	{if $gBitUser->hasPermission( 'bit_p_edit' )}
 		<li><a class="item" href="{$gBitLoc.WIKI_PKG_URL}edit.php">{biticon ipackage=liberty iname=new iexplain="Create page" iforce="icon"} {tr}Create page{/tr}</a></li>
 	{/if}
-	{if $gBitUser->hasPermission( 'bit_p_view' ) and $gBitSystemPrefs.feature_wiki_books eq 'y'}
+	{if $gBitUser->hasPermission( 'bit_p_view' ) and $gBitSystem->isFeatureActive( 'feature_wiki_books' )}
 		<li><a class="item" href="{$gBitLoc.WIKI_PKG_URL}books.php">{biticon ipackage=wiki iname=book iexplain="Wiki Books" iforce="icon"} {tr}Wiki Books{/tr}</a></li>
 	{/if}
-	{if $gBitSystemPrefs.feature_wiki_books eq 'y' && $gBitUser->hasPermission( 'bit_p_edit_books' )}
+	{if $gBitSystem->isFeatureActive( 'feature_wiki_books' ) && $gBitUser->hasPermission( 'bit_p_edit_books' )}
 		<li><a class="item" href="{$gBitLoc.WIKI_PKG_URL}edit_book.php">{biticon ipackage=liberty iname=new iexplain="Create a new book" iforce="icon"} {tr}Create book{/tr}</a></li>
 	{/if}
-	{if $gBitSystemPrefs.feature_listPages eq 'y' and $gBitUser->hasPermission( 'bit_p_view' )}
+	{if $gBitSystem->isFeatureActive( 'feature_listPages' ) and $gBitUser->hasPermission( 'bit_p_view' )}
 		<li><a class="item" href="{$gBitLoc.WIKI_PKG_URL}orphan_pages.php">{biticon ipackage=liberty iname=spacer iexplain="Orphan pages" iforce="icon"} {tr}Orphan pages{/tr}</a></li>
 	{/if}
-	{if $gBitSystemPrefs.feature_wiki_multiprint eq 'y' and $gBitUser->hasPermission( 'bit_p_view' )}
+	{if $gBitSystem->isFeatureActive( 'feature_wiki_multiprint' ) and $gBitUser->hasPermission( 'bit_p_view' )}
 		<li><a class="item" href="{$gBitLoc.WIKI_PKG_URL}print_pages.php">{biticon ipackage=liberty iname=print iexplain="Print" iforce="icon"} {tr}Print{/tr}</a></li>
 	{/if}
-	{if $gBitSystemPrefs.feature_wiki_rankings eq 'y' and $gBitUser->hasPermission( 'bit_p_view' )}
+	{if $gBitSystem->isFeatureActive( 'feature_wiki_rankings' ) and $gBitUser->hasPermission( 'bit_p_view' )}
 		<li><a class="item" href="{$gBitLoc.WIKI_PKG_URL}rankings.php">{biticon ipackage=liberty iname=list iexplain="Wiki Rankings" iforce="icon"} {tr}Wiki Rankings{/tr}</a></li>
 	{/if}
-	{if $gBitUser->hasPermission( 'bit_p_send_pages' ) and $gBitSystemPrefs.feature_comm eq 'y'}
+	{if $gBitUser->hasPermission( 'bit_p_send_pages' ) and $gBitSystem->isFeatureActive( 'feature_comm' )}
 		<li><a class="item" href="{$gBitLoc.XMLRPC_PKG_URL}send_objects.php">{biticon ipackage=liberty iname=spacer iexplain="Send pages" iforce="icon"} {tr}Send pages{/tr}</a></li>
 	{/if}
-	{if $gBitUser->hasPermission( 'bit_p_admin_received_pages' ) and $gBitSystemPrefs.feature_comm eq 'y'}
+	{if $gBitUser->hasPermission( 'bit_p_admin_received_pages' ) and $gBitSystem->isFeatureActive( 'feature_comm' )}
 		<li><a class="item" href="{$gBitLoc.WIKI_PKG_URL}received_pages.php">{biticon ipackage=liberty iname=spacer iexplain="Recieved pages" iforce="icon"} {tr}Received pages{/tr}</a></li>
 	{/if}
-	{if $gBitSystemPrefs.feature_dump eq 'y' and $gBitUser->hasPermission( 'bit_p_view' )}
+	{if $gBitSystem->isFeatureActive( 'feature_dump' ) and $gBitUser->hasPermission( 'bit_p_view' )}
 		<li><a class="item" href="{$gBitLoc.STORAGE_PKG_URL}dump/{$bitdomain}new.tar">{biticon ipackage=liberty iname=save iexplain="Backup" iforce="icon"} {tr}Backup{/tr}</a></li>
 	{/if}
-	{if $gBitSystemPrefs.feature_sandbox eq 'y' and $gBitUser->hasPermission( 'bit_p_view' )}
+	{if $gBitSystem->isFeatureActive( 'feature_sandbox' ) and $gBitUser->hasPermission( 'bit_p_view' )}
 		<li><a class="item" href="{$gBitLoc.WIKI_PKG_URL}edit.php?page=SandBox">{biticon ipackage=liberty iname=spacer iexplain="Sandbox" iforce="icon"} {tr}Sandbox{/tr}</a></li>
 	{/if}
 </ul>
diff --git a/templates/menu_wiki_admin.tpl b/templates/menu_wiki_admin.tpl
index 81482bc..8ff4679 100644
--- a/templates/menu_wiki_admin.tpl
+++ b/templates/menu_wiki_admin.tpl
@@ -1,7 +1,7 @@
 {strip}
 <ul>
 	<li><a class="item" href="{$gBitLoc.KERNEL_PKG_URL}admin/index.php?page=wiki">{tr}Wiki Settings{/tr}</a></li>
-	{if $gBitSystemPrefs.feature_dump eq 'y' and $gBitUser->hasPermission( 'bit_p_view' )}
+	{if $gBitSystem->isFeatureActive( 'feature_dump' ) and $gBitUser->hasPermission( 'bit_p_view' )}
 		<li><a class="item" href="{$gBitLoc.STORAGE_PKG_URL}dump/{$bitdomain}new.tar">{tr}Backup{/tr}</a></li>
 	{/if}
 </ul>
diff --git a/templates/orphan_pages.tpl b/templates/orphan_pages.tpl
index aff1da7..c9e4b74 100644
--- a/templates/orphan_pages.tpl
+++ b/templates/orphan_pages.tpl
@@ -1,2 +1,3 @@
-{* $Header: /cvsroot/bitweaver/_bit_wiki/templates/orphan_pages.tpl,v 1.1 2005/06/19 06:12:45 bitweaver Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_wiki/templates/orphan_pages.tpl,v 1.2 2005/07/17 17:36:47 squareing Exp $ *}
+{assign var=pagetitle value="{tr}Orphan Wiki Pages{/tr}"}
 {include file="bitpackage:wiki/list_pages.tpl"}
diff --git a/templates/page_action_bar.tpl b/templates/page_action_bar.tpl
index 31280d5..66807cf 100644
--- a/templates/page_action_bar.tpl
+++ b/templates/page_action_bar.tpl
@@ -1,66 +1,55 @@
 {if $print_page ne 'y'}
-{if $gBitUser->hasPermission( 'bit_p_view_tabs_and_tools' )}
-{navbar}
-	{if !$lock}
-		{assign var=format_guid value=$pageInfo.format_guid}
-		{if $gLibertySystem->mPlugins.$format_guid.is_active eq 'y'}
-			{if $gBitUser->hasPermission( 'bit_p_edit' ) or $page eq 'SandBox'}
-				{if $beingEdited eq 'y'}
-					{*popup_init src="`$gBitLoc.THEMES_PKG_URL`js/overlib.js"*}
-					<strong><a href="{$gBitLoc.WIKI_PKG_URL}edit.php?page_id={$pageInfo.page_id}" {popup text="$semUser"}>{tr}edit{/tr}</a></strong>
-				{else}
-					<a href="{$gBitLoc.WIKI_PKG_URL}edit.php?page_id={$pageInfo.page_id}">{tr}edit{/tr}</a>
+<div class="navbar">
+	<ul>
+		{if $gBitUser->hasPermission( 'bit_p_view_tabs_and_tools' )}
+			{if !$lock}
+				{assign var=format_guid value=$pageInfo.format_guid}
+				{if $gLibertySystem->mPlugins.$format_guid.is_active eq 'y'}
+					{if $gBitUser->hasPermission( 'bit_p_edit' ) or $page eq 'SandBox'}
+						{if $beingEdited eq 'y'}
+							{*popup_init src="`$gBitLoc.THEMES_PKG_URL`js/overlib.js"*}
+							<li><strong><a href="{$gBitLoc.WIKI_PKG_URL}edit.php?page_id={$pageInfo.page_id}" {popup text="$semUser"}>{tr}edit{/tr}</a></strong></li>
+						{else}
+							<li><a href="{$gBitLoc.WIKI_PKG_URL}edit.php?page_id={$pageInfo.page_id}">{tr}edit{/tr}</a></li>
+						{/if}
+					{/if}
 				{/if}
 			{/if}
-		{/if}
-	{/if}
-	{if $page ne 'SandBox'}
-		{if $gBitUser->hasPermission( 'bit_p_admin_wiki' ) or ($gBitUser->mUserId and ($gBitUser->mUserId eq $pageInfo.modifier_user_id) and ($gBitUser->hasPermission( 'bit_p_lock' )) and ($gBitSystemPrefs.feature_wiki_usrlock eq 'y'))}
-			{if $lock}
-				<a href="{$gBitLoc.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}&amp;action=unlock">{tr}unlock{/tr}</a>
-			{else}
-				<a href="{$gBitLoc.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}&amp;action=lock">{tr}lock{/tr}</a>
+			{if $page ne 'SandBox'}
+				{if $gBitUser->hasPermission( 'bit_p_admin_wiki' ) or ($gBitUser->mUserId and ($gBitUser->mUserId eq $pageInfo.modifier_user_id) and ($gBitUser->hasPermission( 'bit_p_lock' )) and ($gBitSystem->isFeatureActive( 'feature_wiki_usrlock' )))}
+					{if $lock}
+						<li><a href="{$gBitLoc.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}&amp;action=unlock">{tr}unlock{/tr}</a></li>
+					{else}
+						<li><a href="{$gBitLoc.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}&amp;action=lock">{tr}lock{/tr}</a></li>
+					{/if}
+				{/if}
+				{if $gBitUser->hasPermission( 'bit_p_admin_wiki' )}
+					<li><a href="{$gBitLoc.WIKI_PKG_URL}page_permissions.php?page_id={$pageInfo.page_id}">{tr}perms{/tr}</a></li>
+				{/if}
+				{if $gBitSystem->isFeatureActive( 'feature_history' )}
+					<li><a href="{$gBitLoc.WIKI_PKG_URL}page_history.php?page_id={$pageInfo.page_id}">{tr}history{/tr}</a></li>
+				{/if}
 			{/if}
-		{/if}
-		{if $gBitUser->hasPermission( 'bit_p_admin_wiki' )}
-			<a href="{$gBitLoc.WIKI_PKG_URL}page_permissions.php?page_id={$pageInfo.page_id}">{tr}perms{/tr}</a>
-		{/if}
-		{if $gBitSystemPrefs.feature_history eq 'y'}
-			<a href="{$gBitLoc.WIKI_PKG_URL}page_history.php?page_id={$pageInfo.page_id}">{tr}history{/tr}</a>
-		{/if}
-	{/if}
-	{if $gBitSystemPrefs.feature_likePages eq 'y'}
-		<a href="{$gBitLoc.WIKI_PKG_URL}like_pages.php?page_id={$pageInfo.page_id}">{tr}similar{/tr}</a>
-	{/if}
-	{if $gBitSystemPrefs.feature_wiki_undo eq 'y' and $canundo eq 'y'}
-		<a href="{$gBitLoc.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}&amp;undo=1">{tr}undo{/tr}</a>
-	{/if}
-	{if $gBitSystemPrefs.wiki_uses_slides eq 'y'}
-		{if $show_slideshow eq 'y'}
-			<a href="{$gBitLoc.WIKI_PKG_URL}slideshow.php?page_id={$pageInfo.page_id}">{tr}slides{/tr}</a>
-		{elseif $structure eq 'y'}
-			<a href="slideshow2.php?structure_id={$page_info.structure_id}">{tr}slides{/tr}</a>
-		{/if}
-	{/if}
-	{if $gBitUser->hasPermission( 'bit_p_admin_wiki' )}
-		<a href="{$gBitLoc.WIKI_PKG_URL}export_wiki_pages.php?page_id={$pageInfo.page_id}">{tr}export{/tr}</a>
-	{/if}
-	{if $gBitSystemPrefs.feature_wiki_discuss eq 'y'}
-		<a href="{$gBitLoc.BITFORUMS_PKG_URL}view_forum.php?forum_id={$wiki_forum_id}&amp;comments_postComment=post&amp;comments_title={$page|escape:"url"}&amp;comments_data={ "Use this thread to discuss the [index.php\?page=$page|$page page."|escape:"url"}&amp;comment_topictype=n">{tr}discuss{/tr}</a>
-	{/if}
-{/navbar}
-{/if}
-
-{*if $show_page eq 'y'}
-	<!-- this comment code is no longer valid. The current comment system should probably be changed to use this "comzone" style
-	{if $gBitSystemPrefs.feature_wiki_comments eq 'y'}
-		<div class="navbar comment">
-			{if $comments_cant > 0}
-				<a href="javascript:document.location='#comments';flip('comzone{if $comments_show eq 'y'}open{/if}');">{if $comments_cant eq 1}{tr}1 comment{/tr}{else}{$comments_cant} {tr}comments{/tr}{/if}</a>
-			{else}
-				<a href="javascript:document.location='#comments';flip('comzone{if $comments_show eq 'y'}open{/if}');">{tr}comment{/tr}</a>
+			{if $gBitSystem->isFeatureActive( 'feature_likePages' )}
+				<li><a href="{$gBitLoc.WIKI_PKG_URL}like_pages.php?page_id={$pageInfo.page_id}">{tr}similar{/tr}</a></li>
+			{/if}
+			{if $gBitSystem->isFeatureActive( 'feature_wiki_undo' ) and $canundo eq 'y'}
+				<li><a href="{$gBitLoc.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}&amp;undo=1">{tr}undo{/tr}</a></li>
+			{/if}
+			{if $gBitSystem->isFeatureActive( 'wiki_uses_slides' )}
+				{if $show_slideshow eq 'y'}
+					<li><a href="{$gBitLoc.WIKI_PKG_URL}slideshow.php?page_id={$pageInfo.page_id}">{tr}slides{/tr}</a></li>
+				{elseif $structure eq 'y'}
+					<li><a href="slideshow2.php?structure_id={$page_info.structure_id}">{tr}slides{/tr}</a></li>
+				{/if}
 			{/if}
-		</div>
-	{/if}-->
-{/if*}
+			{if $gBitUser->hasPermission( 'bit_p_admin_wiki' )}
+				<li><a href="{$gBitLoc.WIKI_PKG_URL}export_wiki_pages.php?page_id={$pageInfo.page_id}">{tr}export{/tr}</a></li>
+			{/if}
+			{if $gBitSystem->isFeatureActive( 'feature_wiki_discuss' )}
+				<li><a href="{$gBitLoc.BITFORUMS_PKG_URL}view_forum.php?forum_id={$wiki_forum_id}&amp;comments_postComment=post&amp;comments_title={$page|escape:"url"}&amp;comments_data={ "Use this thread to discuss the [index.php\?page=$page|$page page."|escape:"url"}&amp;comment_topictype=n">{tr}discuss{/tr}</a></li>
+			{/if}
+		{/if}
+	</ul>
+</div>
 {/if}
diff --git a/templates/page_display.tpl b/templates/page_display.tpl
index 4ec58ab..785f3ae 100644
--- a/templates/page_display.tpl
+++ b/templates/page_display.tpl
@@ -1,10 +1,11 @@
 {strip}
 <div class="body"{if $user_dbl eq 'y' and $dblclickedit eq 'y' and $gBitUser->hasPermission( 'bit_p_edit' )} ondblclick="location.href='{$gBitLoc.WIKI_PKG_URL}edit.php?page_id={$pageInfo.page_id}';"{/if}>
 	<div class="content">
-		{if $gBitSystemPrefs.liberty_auto_display_attachment_thumbs eq 'y'}
+		{if $gBitSystem->isFeatureActive( 'liberty_auto_display_attachment_thumbs' )}
 			{include file="bitpackage:liberty/storage_thumbs.tpl"}
 		{/if}
 		{$parsed}
+		<div class="clear"></div>
 	</div> <!-- end .content -->
 </div> <!-- end .body -->
 {/strip}
diff --git a/templates/page_header.tpl b/templates/page_header.tpl
index 55b7f2b..e02a2b0 100644
--- a/templates/page_header.tpl
+++ b/templates/page_header.tpl
@@ -3,14 +3,14 @@
 		{include file="bitpackage:categories/categories_nav.tpl"}
 	{/if}
 
-	{if $gBitSystemPrefs.feature_page_title eq 'y'}
+	{if $gBitSystem->isFeatureActive( 'feature_page_title' )}
 		<h1>{$pageInfo.title}</h1>
 		{if $cached_page eq 'y'}<span class="cached">(cached)</span>{/if}
 	{/if}
 
 	{include file="bitpackage:wiki/page_date_bar.tpl"}
 
-	{if $gBitSystemPrefs.feature_wiki_description eq 'y' and $description}
+	{if $gBitSystem->isFeatureActive( 'feature_wiki_description' ) and $description}
 		<h2>{$description}</h2>
 	{/if}
 </div><!-- end .header -->
diff --git a/templates/page_icons.tpl b/templates/page_icons.tpl
index c6d51c1..f5587b8 100644
--- a/templates/page_icons.tpl
+++ b/templates/page_icons.tpl
@@ -1,79 +1,80 @@
 {strip}
 {if $gBitUser->hasPermission( 'bit_p_view_tabs_and_tools' )}
-<div class="floaticon">
-	{if $print_page ne 'y' && count($showstructs) ne 0}
-		<select name="page" onchange="go(this)">
-			<option value="">{tr}Wiki Books{/tr}...</option>
-			{section name=struct loop=$showstructs}
-				<option value="{$gBitLoc.WIKI_PKG_URL}index.php?structure_id={$showstructs[struct].structure_id}">
-					{$showstructs[struct].root_title}
-				</option>
-			{/section}
-		</select>
-	{/if}
-	{if $print_page ne 'y'}
-		{if $lock}
-			{biticon ipackage="wiki" iname="locked" iexplain="locked"}{$info.editor|userlink}
-		{else}
-			{assign var=format_guid value=$pageInfo.format_guid}
-			{if $gLibertySystem->mPlugins.$format_guid.is_active eq 'y'}
-				{if $gBitUser->hasPermission( 'bit_p_edit' ) or $page eq 'SandBox'}
-					<a href="{$gBitLoc.WIKI_PKG_URL}edit.php?page_id={$pageInfo.page_id}" {if $beingEdited eq 'y'}{*popup_init src="`$gBitLoc.THEMES_PKG_URL`js/overlib.js"*}{popup text="$semUser" width="-1"}{/if}>{biticon ipackage=liberty iname="edit" iexplain="edit"}</a>
+	<div class="floaticon">
+		{if $print_page ne 'y' && count($showstructs) ne 0}
+			<select name="page" onchange="go(this)">
+				<option value="">{tr}Wiki Books{/tr}...</option>
+				{section name=struct loop=$showstructs}
+					<option value="{$gBitLoc.WIKI_PKG_URL}index.php?structure_id={$showstructs[struct].structure_id}">
+						{$showstructs[struct].root_title}
+					</option>
+				{/section}
+			</select>
+		{/if}
+		{if $print_page ne 'y'}
+			{if $lock}
+				{biticon ipackage="wiki" iname="locked" iexplain="locked"}{$info.editor|userlink}
+			{else}
+				{assign var=format_guid value=$pageInfo.format_guid}
+				{if $gLibertySystem->mPlugins.$format_guid.is_active eq 'y'}
+					{if $gBitUser->hasPermission( 'bit_p_edit' ) or $page eq 'SandBox'}
+						<a href="{$gBitLoc.WIKI_PKG_URL}edit.php?page_id={$pageInfo.page_id}" {if $beingEdited eq 'y'}{*popup_init src="`$gBitLoc.THEMES_PKG_URL`js/overlib.js"*}{popup text="$semUser" width="-1"}{/if}>{biticon ipackage=liberty iname="edit" iexplain="edit"}</a>
+					{/if}
 				{/if}
 			{/if}
-		{/if}
 
-		{if $gBitSystem->isPackageActive( 'stickies' ) && $gBitUser->hasPermission('bit_p_stickies_edit') }
-			{if ($structureInfo.structure_id)}{assign var='stickyRequest' value="structure_id=`$structureInfo.structure_id`"}
-			{else}{assign var='stickyRequest' value="notated_content_id=`$pageInfo.content_id`"}{/if}
-			<a href="{$gBitLoc.STICKIES_PKG_URL}edit.php?{$stickyRequest}">{biticon ipackage=stickies iname="sticky_note" iexplain="add sticky note"}</a>
-		{/if}
+			{if $gBitSystem->isPackageActive( 'stickies' ) && $gBitUser->hasPermission('bit_p_stickies_edit') }
+				{if ($structureInfo.structure_id)}{assign var='stickyRequest' value="structure_id=`$structureInfo.structure_id`"}
+				{else}{assign var='stickyRequest' value="notated_content_id=`$pageInfo.content_id`"}{/if}
+				<a href="{$gBitLoc.STICKIES_PKG_URL}edit.php?{$stickyRequest}">{biticon ipackage=stickies iname="sticky_note" iexplain="add sticky note"}</a>
+			{/if}
 
-		{if ($structureInfo.structure_id) && (($gStructure->mInfo.creator_user_id == $gBitUser->mUserId) || $gBitUser->hasPermission( 'bit_p_admin_books' )) }
-			<a href="{$gBitLoc.WIKI_PKG_URL}edit_book.php?structure_id={$structureInfo.structure_id}">{biticon ipackage=liberty iname="settings" iexplain="edit book"}</a>
-		{/if}
+			{if ($structureInfo.structure_id) && (($gStructure->mInfo.creator_user_id == $gBitUser->mUserId) || $gBitUser->hasPermission( 'bit_p_admin_books' )) }
+				<a href="{$gBitLoc.WIKI_PKG_URL}edit_book.php?structure_id={$structureInfo.structure_id}">{biticon ipackage=liberty iname="settings" iexplain="edit book"}</a>
+			{/if}
 
-		{if $gBitSystemPrefs.wiki_uses_s5 eq 'y'}
-			<a href="{$gBitLoc.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}&amp;s5=1" onclick="return confirm('this works best in gecko based browsers (mozilla, firefox) or opera (press F11)')">{biticon ipackage=wiki iname="s5" iexplain="s5 slideshow"}</a>
-		{/if}
+			{if $gBitSystem->isFeatureActive( 'wiki_uses_s5' )}
+				<a href="{$gBitLoc.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}&amp;s5=1" onclick="return confirm('this works best in gecko based browsers (mozilla, firefox) or opera (press F11)')">{biticon ipackage=wiki iname="s5" iexplain="s5 slideshow"}</a>
+			{/if}
 
-		{if $cached_page eq 'y'}
-			<a title="{tr}refresh{/tr}" href="{$gBitLoc.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}&amp;refresh=1">{biticon ipackage=liberty iname="refresh" iexplain="refresh"}</a>
-		{/if}
-		{if $gBitUser->hasPermission( 'bit_p_print' )}
-			<a title="{tr}print{/tr}" style="display:none;" href="{$gBitLoc.WIKI_PKG_URL}print.php?{if $structureInfo.root_structure_id}structure_id={$structureInfo.root_structure_id}{else}page_id={$pageInfo.page_id}{/if}">{biticon ipackage=liberty iname="print" iexplain="print"}</a>
-		{/if}
-		{if $gBitSystem->isPackageActive( 'pdf' ) && $gContent->hasUserPermission( 'bit_p_pdf_generation' )}
-			{if $structureInfo.root_structure_id}
-				<a title="{tr}create PDF{/tr}" href="{$gBitLoc.PDF_PKG_URL}?structure_id={$structureInfo.root_structure_id}">{biticon ipackage="pdf" iname="pdf" iexplain="PDF"}</a>
-			{else}
-				<a title="{tr}create PDF{/tr}" href="{$gBitLoc.PDF_PKG_URL}?content_id={$pageInfo.content_id}">{biticon ipackage="pdf" iname="pdf" iexplain="PDF"}</a>
+			{if $cached_page eq 'y'}
+				<a title="{tr}refresh{/tr}" href="{$gBitLoc.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}&amp;refresh=1">{biticon ipackage=liberty iname="refresh" iexplain="refresh"}</a>
 			{/if}
-		{/if}
-		{if $user and $gBitSystem->isPackageActive( 'notepad' ) and $gBitUser->hasPermission( 'bit_p_notepad' )}
-			<a title="{tr}Save{/tr}" href="{$gBitLoc.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}&amp;savenotepad=1">{biticon ipackage="wiki" iname="save" iexplain="save"}</a>
-		{/if}
-		{if $gBitUser->mUserId && $gBitSystem->isFeatureActive( 'feature_user_watches' ) }
-			{if $user_watching_page eq 'y'}
-				<a title="{tr}stop monitoring this page{/tr}" href="{$gBitLoc.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}&amp;watch_event=wiki_page_changed&amp;watch_object={$pageInfo.page_id}&amp;watch_action=remove">{biticon ipackage="users" iname="unwatch" iexplain="stop monitoring"}</a>
-			{else}
-				<a title="{tr}monitor this page{/tr}" href="{$gBitLoc.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}&amp;watch_event=wiki_page_changed&amp;watch_object={$pageInfo.page_id}&amp;watch_action=add">{biticon ipackage="users" iname="watch" iexplain="monitor"}</a>
+			{if $gBitUser->hasPermission( 'bit_p_print' )}
+				<a title="{tr}print{/tr}" style="display:none;" href="{$gBitLoc.WIKI_PKG_URL}print.php?{if $structureInfo.root_structure_id}structure_id={$structureInfo.root_structure_id}{else}page_id={$pageInfo.page_id}{/if}">{biticon ipackage=liberty iname="print" iexplain="print"}</a>
 			{/if}
-		{/if}
-		{if $pageInfo.title ne 'SandBox'}
-			{if $gBitUser->hasPermission( 'bit_p_remove' )}
-				<a title="{tr}remove this page{/tr}" href="{$gBitLoc.WIKI_PKG_URL}remove_page.php?page_id={$pageInfo.page_id}&amp;version=last">{biticon ipackage=liberty iname="delete" iexplain="delete"}</a>
+			{if $gBitSystem->isPackageActive( 'pdf' ) && $gContent->hasUserPermission( 'bit_p_pdf_generation' )}
+				{if $structureInfo.root_structure_id}
+					<a title="{tr}create PDF{/tr}" href="{$gBitLoc.PDF_PKG_URL}?structure_id={$structureInfo.root_structure_id}">{biticon ipackage="pdf" iname="pdf" iexplain="PDF"}</a>
+				{else}
+					<a title="{tr}create PDF{/tr}" href="{$gBitLoc.PDF_PKG_URL}?content_id={$pageInfo.content_id}">{biticon ipackage="pdf" iname="pdf" iexplain="PDF"}</a>
+				{/if}
 			{/if}
-		{/if}
-		{if $gBitSystemPrefs.feature_backlinks eq 'y' and $backlinks}
-			<select name="page" onchange="go(this)">
-				<option value="{$gBitLoc.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}">{tr}backlinks{/tr}...</option>
-				{foreach key=contentId item=backPage from=$backlinks}
-					<option value="{$gBitLoc.BIT_ROOT_URL}index.php?content_id={$contentId}">{$backPage}</option>
-				{/foreach}
-			</select>
-		{/if}
-	{/if}<!-- end print_page -->
-</div><!-- end .floaticon -->
+			{if $user and $gBitSystem->isPackageActive( 'notepad' ) and $gBitUser->hasPermission( 'bit_p_notepad' )}
+				<a title="{tr}Save{/tr}" href="{$gBitLoc.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}&amp;savenotepad=1">{biticon ipackage="wiki" iname="save" iexplain="save"}</a>
+			{/if}
+
+			{if $gBitUser->isRegistered() and $gBitUser->mUserId && $gBitSystem->isFeatureActive( 'feature_user_watches' ) }
+				{if $user_watching_page eq 'y'}
+					<a title="{tr}stop monitoring this page{/tr}" href="{$gBitLoc.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}&amp;watch_event=wiki_page_changed&amp;watch_object={$pageInfo.page_id}&amp;watch_action=remove">{biticon ipackage="users" iname="unwatch" iexplain="stop monitoring"}</a>
+				{else}
+					<a title="{tr}monitor this page{/tr}" href="{$gBitLoc.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}&amp;watch_event=wiki_page_changed&amp;watch_object={$pageInfo.page_id}&amp;watch_action=add">{biticon ipackage="users" iname="watch" iexplain="monitor"}</a>
+				{/if}
+			{/if}
+			{if $pageInfo.title ne 'SandBox'}
+				{if $gBitUser->hasPermission( 'bit_p_remove' )}
+					<a title="{tr}remove this page{/tr}" href="{$gBitLoc.WIKI_PKG_URL}remove_page.php?page_id={$pageInfo.page_id}&amp;version=last">{biticon ipackage=liberty iname="delete" iexplain="delete"}</a>
+				{/if}
+			{/if}
+			{if $gBitSystem->isFeatureActive( 'feature_backlinks' ) and $backlinks}
+				<select name="page" onchange="go(this)">
+					<option value="{$gBitLoc.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}">{tr}backlinks{/tr}...</option>
+					{foreach key=contentId item=backPage from=$backlinks}
+						<option value="{$gBitLoc.BIT_ROOT_URL}index.php?content_id={$contentId}">{$backPage|truncate:30:"...":true}</option>
+					{/foreach}
+				</select>
+			{/if}
+		{/if}<!-- end print_page -->
+	</div>
 {/if}
 {/strip}
diff --git a/templates/preview.tpl b/templates/preview.tpl
index 35eb5ec..b882511 100644
--- a/templates/preview.tpl
+++ b/templates/preview.tpl
@@ -1,5 +1,5 @@
 <h2>{tr}Preview{/tr}: {$title}</h2>
-{if $gBitSystemPrefs.feature_wiki_description eq 'y'}
+{if $gBitSystem->isFeatureActive( 'feature_wiki_description' )}
 <small>{$description}</small>
 {/if}
 <div  class="wikibody">{$parsed}</div>
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}
+