diff options
| -rwxr-xr-x | detail.php | 8 | ||||
| -rwxr-xr-x | main.php | 9 |
2 files changed, 10 insertions, 7 deletions
diff --git a/detail.php b/detail.php index cdda77ac6..287827253 100755 --- a/detail.php +++ b/detail.php @@ -47,14 +47,14 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show <!-- ********** CONTENT ********** --> <div id="dokuwiki__content"><div class="pad group"> - <?php tpl_flush() /* flush the output buffer */ ?> - <?php _tpl_include('pageheader.html') ?> <?php if(!$ERROR): ?> <div class="pageId"><span><?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG)); ?></span></div> <?php endif; ?> <div class="page group"> + <?php tpl_flush() /* flush the output buffer */ ?> + <?php _tpl_include('pageheader.html') ?> <!-- detail start --> <?php if($ERROR): @@ -102,13 +102,13 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show <?php endif; ?> </div> <!-- detail stop --> + <?php _tpl_include('pagefooter.html') ?> + <?php tpl_flush() ?> <?php /* doesn't make sense like this; @todo: maybe add tpl_imginfo()? <div class="docInfo"><?php tpl_pageinfo(); ?></div> */ ?> - <?php tpl_flush() ?> - <?php _tpl_include('pagefooter.html') ?> </div></div><!-- /content --> <hr class="a11y" /> @@ -45,27 +45,30 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show <?php if($showSidebar): ?> <!-- ********** ASIDE ********** --> <div id="dokuwiki__aside"><div class="pad include group"> + <?php tpl_flush() /* flush the output buffer */ ?> + <?php _tpl_include('sidebarheader.html') ?> <?php tpl_include_page($conf['sidebar']) /* includes the given wiki page */ ?> + <?php _tpl_include('sidebarfooter.html') ?> </div></div><!-- /aside --> <?php endif; ?> <!-- ********** CONTENT ********** --> <div id="dokuwiki__content"><div class="pad group"> - <?php tpl_flush() /* flush the output buffer */ ?> - <?php _tpl_include('pageheader.html') ?> <div class="pageId"><span><?php echo hsc($ID) ?></span></div> <div class="page group"> + <?php tpl_flush() ?> + <?php _tpl_include('pageheader.html') ?> <!-- wikipage start --> <?php tpl_content() /* the main content */ ?> <!-- wikipage stop --> + <?php _tpl_include('pagefooter.html') ?> </div> <div class="docInfo"><?php tpl_pageinfo() /* 'Last modified' etc */ ?></div> <?php tpl_flush() ?> - <?php _tpl_include('pagefooter.html') ?> </div></div><!-- /content --> <hr class="a11y" /> |