summaryrefslogtreecommitdiff
path: root/templates/show_page.tpl
diff options
context:
space:
mode:
authorMax Kremmel <xing@synapse.plus.com>2005-08-07 17:46:51 +0000
committerMax Kremmel <xing@synapse.plus.com>2005-08-07 17:46:51 +0000
commit84c9b11f4260b9add6dae43d098db6ba364ddf36 (patch)
tree4c1cca09213a184c4724ddf85e66a7ebc9dc8d31 /templates/show_page.tpl
parentaa1fc688af3a1b78a73369d378b0c5b3cdbd9bee (diff)
downloadwiki-84c9b11f4260b9add6dae43d098db6ba364ddf36.tar.gz
wiki-84c9b11f4260b9add6dae43d098db6ba364ddf36.tar.bz2
wiki-84c9b11f4260b9add6dae43d098db6ba364ddf36.zip
merge recent changes from R1 to HEAD
Diffstat (limited to 'templates/show_page.tpl')
-rw-r--r--templates/show_page.tpl17
1 files changed, 8 insertions, 9 deletions
diff --git a/templates/show_page.tpl b/templates/show_page.tpl
index 4d46e11..f6486fa 100644
--- a/templates/show_page.tpl
+++ b/templates/show_page.tpl
@@ -42,7 +42,7 @@
{tr}The content on this page is licensed under the terms of the{/tr} <a href="{$wikiLicensePage}"><b>{tr}{$wikiSubmitNotice}{/tr}</b></a>.
{/if}
{if $gBitUser->hasPermission( 'bit_p_edit_copyrights' )}
- <br />{tr}To edit the copyright notices{/tr} <a href="{$gBitSystem.WIKI_PKG_URL}copyrights.php?page_id={$pageInfo.page_id}">{tr}click here{/tr}</a>.
+ <br />{tr}To edit the copyright notices{/tr} <a href="{$smarty.const.WIKI_PKG_URL}copyrights.php?page_id={$pageInfo.page_id}">{tr}click here{/tr}</a>.
{/if}
</p>
{/if}
@@ -50,17 +50,16 @@
{if $print_page ne 'y'}
{include file="bitpackage:wiki/page_action_bar.tpl"}
{/if}
-
- {if $gBitSystem->isPackageActive( 'pigeonholes' )}
- {include file="bitpackage:pigeonholes/display_members.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}
+{if $gBitSystem->isPackageActive( 'pigeonholes' )}
+ {include file="bitpackage:pigeonholes/display_members.tpl"}
+{/if}
+
+{if $gBitSystem->isPackageActive( 'categories' )}
+ {include file="bitpackage:categories/categories_objects.tpl"}
+{/if}