Compare commits

..

10 Commits

Author SHA1 Message Date
0ed8206959 Suppress editing header info text 2026-04-07 09:01:17 +02:00
a7a27436b6 Remove CRT Effect 2026-03-25 14:57:10 +01:00
8f796bfaf0 fix position of crt effect 2026-03-25 14:15:17 +01:00
1a8adbcfd8 Add CRT style 2026-03-25 14:07:42 +01:00
fd53bfa625 remove leading start breadcrumb 2026-03-25 13:51:45 +01:00
e3641093ab Update apple icon 2026-03-25 13:47:33 +01:00
339e171ec7 Update edit button placement 2026-03-17 10:58:03 +01:00
e1e89b40fb Update section edit buttons 2026-03-17 10:51:30 +01:00
b81e5cf6e4 No special font for text areas 2026-03-17 06:55:33 +01:00
41d60d28cc Update default favicon 2026-03-17 06:55:22 +01:00
8 changed files with 172 additions and 41 deletions

View File

@@ -105,8 +105,6 @@ div.picker button.toolbutton {
margin-right: 0;
margin-left: 1em;
}
.dokuwiki .editBar .editButtons button {
}
/* summary input and minor changes checkbox */
.dokuwiki .editBar .summary {
@@ -140,9 +138,46 @@ div.picker button.toolbutton {
/* section edit buttons
********************************************************************/
/* Hidden for now - positioning was problematic */
.dokuwiki .secedit {
display: none;
.dokuwiki .section-heading-row {
display: flex;
align-items: baseline;
}
.dokuwiki .section-heading-row > .secedit {
flex-shrink: 0;
margin-left: .4em;
}
[dir=rtl] .dokuwiki .section-heading-row > .secedit {
margin-left: 0;
margin-right: .4em;
}
.dokuwiki .section-heading-row > .secedit form {
margin: 0;
}
.dokuwiki .section-heading-row > .secedit button {
border: 0;
padding: .15em;
min-width: 1.25em;
background: transparent;
color: @ini_icons;
font-size: 0;
line-height: 1;
cursor: pointer;
}
.dokuwiki .section-heading-row > .secedit button::before {
content: '\270E edit';
opacity: 0.75;
font-style: italic;
font-size: .95rem;
}
.dokuwiki .section-heading-row > .secedit button:hover,
.dokuwiki .section-heading-row > .secedit button:focus {
color: @ini_link;
}
/* Sidebar should never show section edit buttons */

View File

@@ -252,10 +252,6 @@
}
}
.dokuwiki textarea.edit {
font-family: "VT323", Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Nimbus Mono L", Monaco, "Courier New", monospace;
}
.dokuwiki div.preview {
margin: 0 -2em;
padding: 0 2em;

BIN
images/apple-touch-icon.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
images/favicon.ico Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 263 KiB

130
main.php
View File

@@ -8,59 +8,127 @@
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
*/
if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */
if (!defined("DOKU_INC")) {
die();
} /* must be run from within DokuWiki */
$hasSidebar = page_findnearest($conf['sidebar']);
$showSidebar = $hasSidebar && ($ACT == 'show');
// Replace default section edit buttons with a compact pencil icon
global $EVENT_HANDLER;
$EVENT_HANDLER->register_hook(
"HTML_SECEDIT_BUTTON",
"BEFORE",
null,
"_luxtools_secedit_button",
);
// Remove the edit page intro text ("Edit the page and hit Save...")
$EVENT_HANDLER->register_hook(
"PARSER_LOCALE_XHTML",
"BEFORE",
null,
"_luxtools_suppress_edit_intro",
);
function _luxtools_suppress_edit_intro(\dokuwiki\Extension\Event $event, $param)
{
if ($event->data['id'] === 'edit' || $event->data['id'] === 'editrev') {
$event->preventDefault();
$event->data['html'] = '';
}
}
function _luxtools_secedit_button(\dokuwiki\Extension\Event $event, $param)
{
global $ID, $INFO;
$data = $event->data;
if (!isset($data["name"]) || $data["name"] === "") {
$event->preventDefault();
$event->result = "";
return;
}
$name = $data["name"];
$secid = $data["secid"];
unset($data["name"], $data["secid"]);
$params = array_merge(
[
"do" => "edit",
"rev" => $INFO["lastmod"],
"summary" => "[" . $name . "] ",
],
$data,
);
$html =
'<div class="secedit editbutton_' .
hsc($data["target"]) .
" editbutton_" .
(int) $secid .
'">';
$html .= html_btn("secedit", $ID, "", $params, "post", $name);
$html .= "</div>";
$event->preventDefault();
$event->result = $html;
}
$hasSidebar = page_findnearest($conf["sidebar"]);
$showSidebar = $hasSidebar && $ACT == "show";
?><!DOCTYPE html>
<html lang="<?php echo $conf['lang'] ?>" dir="<?php echo $lang['direction'] ?>" class="no-js">
<html lang="<?php echo $conf["lang"]; ?>" dir="<?php echo $lang[
"direction"
]; ?>" class="no-js">
<head>
<meta charset="utf-8" />
<title><?php tpl_pagetitle() ?></title>
<?php tpl_metaheaders() ?>
<title><?php tpl_pagetitle(); ?></title>
<?php tpl_metaheaders(); ?>
<meta name="viewport" content="width=device-width,initial-scale=1" />
<?php echo tpl_favicon(['favicon', 'mobile']) ?>
<?php tpl_includeFile('meta.html') ?>
<?php echo tpl_favicon(["favicon", "mobile"]); ?>
<?php tpl_includeFile("meta.html"); ?>
</head>
<body>
<div id="dokuwiki__site"><div id="dokuwiki__top" class="site <?php echo tpl_classes(); ?> <?php
echo ($showSidebar) ? 'showSidebar' : ''; ?> <?php echo ($hasSidebar) ? 'hasSidebar' : ''; ?>">
<div id="dokuwiki__site"><div id="dokuwiki__top" class="site <?php echo tpl_classes(); ?> <?php echo $showSidebar
? "showSidebar"
: ""; ?> <?php echo $hasSidebar ? "hasSidebar" : ""; ?>">
<?php include(__DIR__ . '/tpl_header.php') ?>
<?php include __DIR__ . "/tpl_header.php"; ?>
<div class="wrapper group">
<?php if ($showSidebar): ?>
<!-- ********** ASIDE ********** -->
<nav id="dokuwiki__aside" aria-label="<?php echo $lang['sidebar']
?>"><div class="pad aside include group">
<h3 class="toggle"><?php echo $lang['sidebar'] ?></h3>
<nav id="dokuwiki__aside" aria-label="<?php echo $lang[
"sidebar"
]; ?>"><div class="pad aside include group">
<h3 class="toggle"><?php echo $lang["sidebar"]; ?></h3>
<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') ?>
<?php tpl_flush(); ?>
<?php tpl_includeFile("sidebarheader.html"); ?>
<?php tpl_include_page($conf["sidebar"], true, true); ?>
<?php tpl_includeFile("sidebarfooter.html"); ?>
</div></div>
</div></nav><!-- /aside -->
<?php endif; ?>
<!-- ********** CONTENT ********** -->
<main id="dokuwiki__content"><div class="pad group">
<?php html_msgarea() ?>
<?php html_msgarea(); ?>
<div class="page group">
<?php tpl_flush() ?>
<?php tpl_includeFile('pageheader.html') ?>
<?php tpl_flush(); ?>
<?php tpl_includeFile("pageheader.html"); ?>
<!-- wikipage start -->
<?php tpl_content() ?>
<?php tpl_content(); ?>
<!-- wikipage stop -->
<?php tpl_includeFile('pagefooter.html') ?>
<?php tpl_includeFile("pagefooter.html"); ?>
</div>
<div class="docInfo"><?php tpl_pageinfo() ?></div>
<div class="docInfo"><?php tpl_pageinfo(); ?></div>
<?php tpl_flush() ?>
<?php tpl_flush(); ?>
<hr class="a11y" />
</div></main><!-- /content -->
@@ -70,13 +138,17 @@ $showSidebar = $hasSidebar && ($ACT == 'show');
<!-- PAGE ACTIONS (Status Bar) -->
<?php
$menuClass = \dokuwiki\Menu\PageMenu::class;
include(__DIR__ . '/tpl_pagetools.php');
include __DIR__ . "/tpl_pagetools.php";
?>
<?php include(__DIR__ . '/tpl_footer.php') ?>
<?php include __DIR__ . "/tpl_footer.php"; ?>
</div></div><!-- /site -->
<div class="no"><?php tpl_indexerWebBug() /* provide DokuWiki housekeeping, required in all templates */ ?></div>
<div id="screen__mode" class="no"></div><?php /* helper to detect CSS media query in script.js */ ?>
<div class="no"><?php tpl_indexerWebBug();
/* provide DokuWiki housekeeping, required in all templates */
?></div>
<div id="screen__mode" class="no"></div><?php
/* helper to detect CSS media query in script.js */
?>
</body>
</html>

View File

@@ -139,6 +139,27 @@ jQuery(function(){
}
}());
// Relocate section edit buttons next to their headings.
// DokuWiki renders the edit marker after the section content div,
// so we match by secid: .editbutton_N belongs to h*.sectioneditN.
(function enhanceSectionEditButtons() {
jQuery('#dokuwiki__content .secedit[class*="editbutton_"]').each(function () {
var $btn = jQuery(this);
var match = $btn.attr('class').match(/editbutton_(\d+)/);
if (!match) return;
var $heading = jQuery('#dokuwiki__content .sectionedit' + match[1]);
if (!$heading.length || !$heading.is('h1,h2,h3,h4,h5,h6')) return;
// Skip if already relocated
if ($heading.parent().hasClass('section-heading-row')) return;
var $wrapper = jQuery('<div/>', {'class': 'section-heading-row'});
$heading.before($wrapper);
$wrapper.append($heading, $btn);
});
}());
// enhance header search with suggestions and keyboard navigation
(function enhanceSearch(){
var $input = jQuery('#qsearch__in');

View File

@@ -88,5 +88,3 @@ __tablet_width__ = "800px" ; @ini_tablet_width
__phone_width__ = "480px" ; @ini_phone_width
__theme_color__ = "#008800" ; @_ini_theme_color: theme_color of the web app

View File

@@ -16,6 +16,15 @@ if ($conf['useacl']) {
$breadcrumbsHtml = '';
if ($conf['youarehere']) {
$breadcrumbsHtml = tpl_youarehere(null, true);
// Remove the "You are here" label and the start page link,
// since the wiki logo already links to the start page.
if ($breadcrumbsHtml) {
// Strip the label span and the home/start page span
$breadcrumbsHtml = preg_replace('/<span class="bchead">.*?<\/span>/', '', $breadcrumbsHtml);
$breadcrumbsHtml = preg_replace('/<span class="home">.*?<\/span>/', '', $breadcrumbsHtml);
// Remove any leading separator left over after stripping the home link
$breadcrumbsHtml = preg_replace('/^\s*»\s*/', '' , trim($breadcrumbsHtml));
}
}
if (!$breadcrumbsHtml && $conf['breadcrumbs']) {
$breadcrumbsHtml = tpl_breadcrumbs(null, true);