Simplify page structure

This commit is contained in:
2026-01-16 15:04:53 +01:00
parent 5544cb0228
commit decb19f5bd
6 changed files with 60 additions and 88 deletions

View File

@@ -99,7 +99,7 @@ $sidebarElement = tpl_getConf('sidebarIsNav') ? 'nav' : 'aside';
echo ($showSidebar) ? 'hasSidebar' : ''; ?>">
<?php html_msgarea() /* occasional error and info messages on top of the page */ ?>
<!-- ********** HEADER ********** -->
<header id="dokuwiki__header"><div class="pad">
<header id="dokuwiki__header">
<?php tpl_includeFile('header.html') ?>
<ul class="a11y skip">
@@ -108,32 +108,32 @@ $sidebarElement = tpl_getConf('sidebarIsNav') ? 'nav' : 'aside';
<div class="clearer"></div>
<hr class="a11y" />
</div></header><!-- /header -->
</header><!-- /header -->
<div class="wrapper">
<!-- ********** ASIDE ********** -->
<?php if ($showSidebar): ?>
<<?php echo $sidebarElement ?> id="dokuwiki__aside" aria-label="<?php echo $lang['sidebar'] ?>"><div class="pad aside include group">
<fieldset class="tui-fieldset luxtools__sidebar-fieldset">
<<?php echo $sidebarElement ?> id="dokuwiki__aside" class="aside include group" aria-label="<?php echo $lang['sidebar'] ?>">
<fieldset class="tui-fieldset tui-border-solid luxtools__sidebar-fieldset">
<legend><?php echo $lang['sidebar'] ?></legend>
<?php tpl_includeFile('sidebarheader.html') ?>
<?php tpl_include_page($conf['sidebar'], 1, 1) /* includes the nearest sidebar page */ ?>
<?php tpl_includeFile('sidebarfooter.html') ?>
</fieldset>
<div class="clearer"></div>
</div></<?php echo $sidebarElement ?>><!-- /aside -->
</<?php echo $sidebarElement ?>><!-- /aside -->
<?php endif; ?>
<!-- ********** CONTENT ********** -->
<main id="dokuwiki__content"><div class="pad">
<main id="dokuwiki__content">
<?php tpl_flush() /* flush the output buffer */ ?>
<?php tpl_includeFile('pageheader.html') ?>
<div class="page">
<!-- wikipage start -->
<fieldset class="tui-fieldset luxtools__page-fieldset">
<fieldset class="tui-fieldset tui-border-solid luxtools__page-fieldset">
<legend class="center"><?php echo hsc($ID); ?></legend>
<?php tpl_content() /* the main content */ ?>
</fieldset>
@@ -143,33 +143,31 @@ $sidebarElement = tpl_getConf('sidebarIsNav') ? 'nav' : 'aside';
<?php tpl_flush() ?>
<?php tpl_includeFile('pagefooter.html') ?>
</div></main><!-- /content -->
</main><!-- /content -->
<div class="clearer"></div>
<hr class="a11y" />
<!-- PAGE ACTIONS -->
<?php if ($showTools): ?>
<nav id="dokuwiki__pagetools" class="tui-statusbar" aria-labelledby="dokuwiki__pagetools_heading">
<h3 class="a11y" id="dokuwiki__pagetools_heading"><?php echo $lang['page_tools'] ?></h3>
<ul>
<?php if (file_exists(DOKU_INC . 'inc/Menu/PageMenu.php')) {
echo (new \dokuwiki\Menu\PageMenu())->getListItems('action ', false);
} else {
_tpl_pagetools();
} ?>
</ul>
</nav>
<?php endif; ?>
</div><!-- /wrapper -->
<!-- PAGE ACTIONS -->
<?php if ($showTools): ?>
<nav id="dokuwiki__pagetools" class="tui-statusbar" aria-labelledby="dokuwiki__pagetools_heading">
<h3 class="a11y" id="dokuwiki__pagetools_heading"><?php echo $lang['page_tools'] ?></h3>
<ul>
<?php if (file_exists(DOKU_INC . 'inc/Menu/PageMenu.php')) {
echo (new \dokuwiki\Menu\PageMenu())->getListItems('action ', false);
} else {
_tpl_pagetools();
} ?>
</ul>
</nav>
<?php endif; ?>
<!-- ********** FOOTER ********** -->
<footer id="dokuwiki__footer"><div class="pad">
<footer id="dokuwiki__footer">
<div class="doc"><?php tpl_pageinfo() /* 'Last modified' etc */ ?></div>
<?php tpl_license('button') /* content license, parameters: img=*badge|button|0, imgonly=*0|1, return=*0|1 */ ?>
<?php tpl_includeFile('footer.html') ?>
</div></footer><!-- /footer -->
</footer><!-- /footer -->
</div></div><!-- /site -->
<div class="no"><?php tpl_indexerWebBug() /* provide DokuWiki housekeeping, required in all templates */ ?></div>