updated to latest version
This commit is contained in:
parent
19924b2d6f
commit
7d3d6aec8e
7 changed files with 171 additions and 121 deletions
17
main.php
17
main.php
|
|
@ -11,6 +11,7 @@ if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */
|
|||
@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */
|
||||
|
||||
$showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER['REMOTE_USER'] );
|
||||
$showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show');
|
||||
?><!DOCTYPE html>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang'] ?>"
|
||||
lang="<?php echo $conf['lang'] ?>" dir="<?php echo $lang['direction'] ?>" class="no-js">
|
||||
|
|
@ -35,7 +36,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
|
|||
see http://www.dokuwiki.org/devel:action_modes for a list of action modes */ ?>
|
||||
<?php /* .dokuwiki should always be in one of the surrounding elements (e.g. plugins and templates depend on it) */ ?>
|
||||
<div id="dokuwiki__site"><div id="dokuwiki__top"
|
||||
class="dokuwiki site mode_<?php echo $ACT ?>">
|
||||
class="dokuwiki site mode_<?php echo $ACT ?> <?php echo ($showSidebar) ? 'hasSidebar' : '' ?>">
|
||||
<?php html_msgarea() /* occasional error and info messages on top of the page */ ?>
|
||||
<?php tpl_includeFile('header.html') ?>
|
||||
|
||||
|
|
@ -112,12 +113,14 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
|
|||
<div class="wrapper">
|
||||
|
||||
<!-- ********** ASIDE ********** -->
|
||||
<div id="dokuwiki__aside"><div class="pad include">
|
||||
<?php tpl_includeFile('sidebarheader.html') ?>
|
||||
<?php tpl_include_page($conf['sidebar'], 1, 1) /* includes the nearest sidebar page */ ?>
|
||||
<?php tpl_includeFile('sidebarfooter.html') ?>
|
||||
<div class="clearer"></div>
|
||||
</div></div><!-- /aside -->
|
||||
<?php if ($showSidebar): ?>
|
||||
<div id="dokuwiki__aside"><div class="pad include">
|
||||
<?php tpl_includeFile('sidebarheader.html') ?>
|
||||
<?php tpl_include_page($conf['sidebar'], 1, 1) /* includes the nearest sidebar page */ ?>
|
||||
<?php tpl_includeFile('sidebarfooter.html') ?>
|
||||
<div class="clearer"></div>
|
||||
</div></div><!-- /aside -->
|
||||
<?php endif; ?>
|
||||
|
||||
<!-- ********** CONTENT ********** -->
|
||||
<div id="dokuwiki__content"><div class="pad">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue