luxick/luxtools-template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify page structure

Browse Source
This commit is contained in:
luxick
2026-01-16 15:04:53 +01:00
parent 5544cb0228
commit decb19f5bd
6 changed files with 60 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
css/basic.css
View File

@@ -45,6 +45,7 @@ h6 {
font-family: "Perfect DOS VGA 437", Constantia, Utopia, Lucidabright, Lucida, Georgia, "Nimbus Roman No9 L", serif; font-family: "Perfect DOS VGA 437", Constantia, Utopia, Lucidabright, Lucida, Georgia, "Nimbus Roman No9 L", serif;
font-weight: bold; font-weight: bold;
color: __text_neu__; color: __text_neu__;
text-align: left;
background-color: inherit; background-color: inherit;
padding: 0; padding: 0;
line-height: 1.2; line-height: 1.2;

23
css/mobile.css
View File

@@ -6,25 +6,18 @@
@media only screen and (max-width: 42em) { @media only screen and (max-width: 42em) {
#dokuwiki__aside { #dokuwiki__site .wrapper {
width: 100%; flex-direction: column;
float: none; gap: 1.4em;
margin-bottom: 1.4em;
} }
#dokuwiki__aside > .pad {
margin: 0; #dokuwiki__aside {
width: auto;
flex: 0 0 auto;
} }
.hasSidebar #dokuwiki__content { .hasSidebar #dokuwiki__content {
float: none; margin: 0;
margin-left: 0;
margin-right: 0;
}
.hasSidebar #dokuwiki__content > .pad {
margin-left: 0;
}
[dir=rtl] .hasSidebar #dokuwiki__content > .pad {
margin-right: 0;
} }
#dokuwiki__header .headings { #dokuwiki__header .headings {

54
css/structure.css
View File

@@ -16,8 +16,6 @@ body {
} }
#dokuwiki__header { #dokuwiki__header {
}
#dokuwiki__header > .pad {
} }
#dokuwiki__header .headings { #dokuwiki__header .headings {
float: left; float: left;
@@ -37,45 +35,27 @@ body {
#dokuwiki__site .wrapper { #dokuwiki__site .wrapper {
position: relative; position: relative;
display: flex;
align-items: flex-start;
gap: 1.5em;
}
[dir=rtl] #dokuwiki__site .wrapper {
flex-direction: row-reverse;
} }
#dokuwiki__aside { #dokuwiki__aside {
width: __sidebar_width__; flex: 0 0 __sidebar_width__;
float: left; width: __sidebar_width__;
position: relative; position: relative;
display: block; display: block;
} }
[dir=rtl] #dokuwiki__aside {
float: right;
}
#dokuwiki__aside > .pad {
margin: 0 1.5em 0 0;
}
[dir=rtl] #dokuwiki__aside > .pad {
margin: 0 0 0 1.5em;
}
/* make content wider when there's no sidebar */ #dokuwiki__content {
.hasSidebar #dokuwiki__content { flex: 1 1 auto;
float: right; min-width: 0;
margin-left: -__sidebar_width__; }
width: 100%;
}
[dir=rtl] .hasSidebar #dokuwiki__content {
float: left;
margin-left: 0;
margin-right: -__sidebar_width__;
}
.hasSidebar #dokuwiki__content > .pad {
margin-left: __sidebar_width__;
}
[dir=rtl] .hasSidebar #dokuwiki__content > .pad {
margin-left: 0;
margin-right: __sidebar_width__;
}
#dokuwiki__footer { #dokuwiki__footer {
clear: both; clear: both;
} }
#dokuwiki__footer > .pad {
}

12
css/tuivision.css
View File

@@ -56,12 +56,8 @@ body.luxtools-tv .hasSidebar #dokuwiki__content {
width: auto; width: auto;
} }
body.luxtools-tv .hasSidebar #dokuwiki__content > .pad {
margin-left: 0;
}
/* Let the page fieldset fill available vertical space */ /* Let the page fieldset fill available vertical space */
body.luxtools-tv #dokuwiki__content > .pad { body.luxtools-tv #dokuwiki__content {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: 100%; height: 100%;
@@ -217,7 +213,7 @@ body.luxtools-tv .luxtools__page-fieldset > * {
} }
/* Avoid double spacing from DokuWiki pads */ /* Avoid double spacing from DokuWiki pads */
#dokuwiki__content > .pad { #dokuwiki__content {
padding-top: 0; padding-top: 0;
} }
@@ -261,3 +257,7 @@ body.luxtools-tv .luxtools__page-fieldset > * {
.luxtools__hotkey { .luxtools__hotkey {
margin-right: 4px; margin-right: 4px;
} }
.tui-fieldset {
background-color: #0000a8;
}

50
main.php
View File

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

8
mediamanager.php
View File

@@ -28,18 +28,18 @@ if (!defined('DOKU_INC')) die();
<body> <body>
<div id="media__manager" class="<?php echo tpl_classes(); ?>"> <div id="media__manager" class="<?php echo tpl_classes(); ?>">
<?php html_msgarea() ?> <?php html_msgarea() ?>
<nav id="mediamgr__aside"><div class="pad"> <nav id="mediamgr__aside" class="pad">
<h1><?php echo hsc($lang['mediaselect'])?></h1> <h1><?php echo hsc($lang['mediaselect'])?></h1>
<?php /* keep the id! additional elements are inserted via JS here */?> <?php /* keep the id! additional elements are inserted via JS here */?>
<div id="media__opts"></div> <div id="media__opts"></div>
<?php tpl_mediaTree() ?> <?php tpl_mediaTree() ?>
</div></nav> </nav>
<main id="mediamgr__content"><div class="pad"> <main id="mediamgr__content" class="pad">
<?php tpl_mediaContent() ?> <?php tpl_mediaContent() ?>
</div></main> </main>
</div> </div>
</body> </body>
</html> </html>