diff options
| author | Anika Henke <anika@selfthinker.org> | 2015-07-25 23:13:18 +0100 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2015-07-25 23:13:18 +0100 |
| commit | 0bfc8d5a03c495c3436780901fe59341faee4d9e (patch) | |
| tree | 5fe7a6e2e087880647a748b1fbd53ca66aafd943 /lib/tpl/dokuwiki/main.php | |
| parent | cf2c8e759bf06596f9492d090f4dd8dbb76a178c (diff) | |
| parent | 6cb9974651aef2a41b48fcb922cc6baa18a0660f (diff) | |
| download | rpg-0bfc8d5a03c495c3436780901fe59341faee4d9e.tar.gz rpg-0bfc8d5a03c495c3436780901fe59341faee4d9e.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into styler
Conflicts:
lib/exe/css.php
Diffstat (limited to 'lib/tpl/dokuwiki/main.php')
| -rw-r--r-- | lib/tpl/dokuwiki/main.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 165230e8a..eea1df71a 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -38,12 +38,12 @@ $showSidebar = $hasSidebar && ($ACT=='show'); <!-- ********** ASIDE ********** --> <div id="dokuwiki__aside"><div class="pad aside include group"> <h3 class="toggle"><?php echo $lang['sidebar'] ?></h3> - <div class="content"> + <div class="content"><div class="group"> <?php tpl_flush() ?> <?php tpl_includeFile('sidebarheader.html') ?> <?php tpl_include_page($conf['sidebar'], true, true) ?> <?php tpl_includeFile('sidebarfooter.html') ?> - </div> + </div></div> </div></div><!-- /aside --> <?php endif; ?> |