diff options
| author | Max Kremmel <xing@synapse.plus.com> | 2005-07-17 17:36:47 +0000 |
|---|---|---|
| committer | Max Kremmel <xing@synapse.plus.com> | 2005-07-17 17:36:47 +0000 |
| commit | b3f697de17baa39ed858e9c4979fe33869767fa6 (patch) | |
| tree | c5ef5c22283a7516be42de59bc49e6a25ea607c4 /templates/show_page.tpl | |
| parent | 5d59979a8999836f5b1eb620dde8c33fa208a9ba (diff) | |
| download | wiki-b3f697de17baa39ed858e9c4979fe33869767fa6.tar.gz wiki-b3f697de17baa39ed858e9c4979fe33869767fa6.tar.bz2 wiki-b3f697de17baa39ed858e9c4979fe33869767fa6.zip | |
Merge recent changes from R1 to HEAD - never doing this again.
Diffstat (limited to 'templates/show_page.tpl')
| -rw-r--r-- | templates/show_page.tpl | 22 |
1 files changed, 16 insertions, 6 deletions
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}&pagenum={$first_page}">« «</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} + |